--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package dcmtk
libdcmtk2 package contains currently underlinked libraries. As per:
http://release.debian.org/testing/rc_policy.txt 5(f)
"Shared libraries must normally be linked with all libraries they use symbols
from."
Thus I have imported patch from Andrey Rahmatullin (see: 677721#34) to fix
those. debdiff attached.
Thanks
unblock dcmtk/3.6.0-12
-- System Information:
Debian Release: 6.0.6
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable'), (200, 'testing'), (100,
'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-0.bpo.3-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru dcmtk-3.6.0/debian/changelog dcmtk-3.6.0/debian/changelog
--- dcmtk-3.6.0/debian/changelog 2012-12-20 13:22:26.000000000 +0100
+++ dcmtk-3.6.0/debian/changelog 2012-05-31 11:31:19.000000000 +0200
@@ -1,11 +1,3 @@
-dcmtk (3.6.0-12) unstable; urgency=low
-
- [ Andrey Rahmatullin ]
- * Fix underlinked libraries. Closes: #677721
- - debian/patches/underlink.patch
-
- -- Mathieu Malaterre <ma...@debian.org> Thu, 20 Dec 2012 13:20:45 +0100
-
dcmtk (3.6.0-11) unstable; urgency=low
* Fix compilation with gcc 4.7. Closes: #674361
diff -Nru dcmtk-3.6.0/debian/patches/underlink.patch dcmtk-3.6.0/debian/patches/underlink.patch
--- dcmtk-3.6.0/debian/patches/underlink.patch 2012-12-20 13:22:26.000000000 +0100
+++ dcmtk-3.6.0/debian/patches/underlink.patch 2012-05-31 11:19:11.000000000 +0200
@@ -3,33 +3,27 @@
ar. We need to provide libraries only when dynamic library is built.
Author: Ilya Barygin <randomact...@ubuntu.com>
Bug-Debian: http://bugs.debian.org/674586
-Bug-Debian: http://bugs.debian.org/677721
---- a/dcmsign/libsrc/Makefile.in
-+++ b/dcmsign/libsrc/Makefile.in
-@@ -17,6 +17,8 @@
- dcmdatadir = $(top_srcdir)/../dcmdata
-
- LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include
-+LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc
-+LOCALLIBS = -lofstd -loflog -ldcmdata
- LOCALDEFS =
-
- objs = dcsignat.o sicert.o sidsa.o simd5.o siprivat.o sirsa.o sisprof.o \
-@@ -34,7 +36,11 @@
+Index: dcmtk-3.6.0/dcmsign/libsrc/Makefile.in
+===================================================================
+--- dcmtk-3.6.0.orig/dcmsign/libsrc/Makefile.in 2012-05-31 10:45:58.207193330 +0200
++++ dcmtk-3.6.0/dcmsign/libsrc/Makefile.in 2012-05-31 10:45:59.843193307 +0200
+@@ -34,7 +34,11 @@
$(library): $(objs)
+ifeq ($(AR),ar)
$(AR) $(ARFLAGS) $@ $(objs)
+else
-+ $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(OPENSSLLIBS)
++ $(AR) $(ARFLAGS) $@ $(objs) $(OPENSSLLIBS)
+endif
$(RANLIB) $@
---- a/ofstd/libsrc/Makefile.in
-+++ b/ofstd/libsrc/Makefile.in
+Index: dcmtk-3.6.0/ofstd/libsrc/Makefile.in
+===================================================================
+--- dcmtk-3.6.0.orig/ofstd/libsrc/Makefile.in 2012-05-31 10:45:58.219193330 +0200
++++ dcmtk-3.6.0/ofstd/libsrc/Makefile.in 2012-05-31 10:45:59.843193307 +0200
@@ -29,7 +29,11 @@
@@ -41,336 +35,4 @@
+endif
$(RANLIB) $@
-
---- a/Makefile
-+++ b/Makefile
-@@ -7,27 +7,27 @@
-
- include $(configdir)/Makefile.def
-
--all: config-all ofstd-all oflog-all dcmdata-all dcmtls-all dcmnet-all dcmqrdb-all dcmwlm-all dcmimgle-all dcmsr-all dcmsign-all dcmpstat-all dcmimage-all dcmjpeg-all dcmjpls-all
-+all: config-all ofstd-all oflog-all dcmdata-all dcmnet-all dcmtls-all dcmqrdb-all dcmwlm-all dcmimgle-all dcmsr-all dcmsign-all dcmpstat-all dcmimage-all dcmjpeg-all dcmjpls-all
-
--libsrc-all: ofstd-libsrc-all oflog-libsrc-all dcmdata-libsrc-all dcmtls-libsrc-all dcmnet-libsrc-all dcmqrdb-libsrc-all dcmwlm-libsrc-all dcmimgle-libsrc-all dcmsr-libsrc-all dcmsign-libsrc-all dcmpstat-libsrc-all dcmimage-libsrc-all dcmjpeg-libsrc-all dcmjpls-libsrc-all
-+libsrc-all: ofstd-libsrc-all oflog-libsrc-all dcmdata-libsrc-all dcmnet-libsrc-all dcmtls-libsrc-all dcmqrdb-libsrc-all dcmwlm-libsrc-all dcmimgle-libsrc-all dcmsr-libsrc-all dcmsign-libsrc-all dcmpstat-libsrc-all dcmimage-libsrc-all dcmjpeg-libsrc-all dcmjpls-libsrc-all
-
--install: config-install ofstd-install oflog-install dcmdata-install dcmtls-install dcmnet-install dcmqrdb-install dcmwlm-install dcmimgle-install dcmsr-install dcmsign-install dcmpstat-install dcmimage-install dcmjpeg-install dcmjpls-install dcmtk-install-doc install-man
-+install: config-install ofstd-install oflog-install dcmdata-install dcmnet-install dcmtls-install dcmqrdb-install dcmwlm-install dcmimgle-install dcmsr-install dcmsign-install dcmpstat-install dcmimage-install dcmjpeg-install dcmjpls-install dcmtk-install-doc install-man
-
- install-all: install install-lib install-html
-
--install-bin: config-install-bin ofstd-install-bin oflog-install-bin dcmdata-install-bin dcmtls-install-bin dcmnet-install-bin dcmqrdb-install-bin dcmwlm-install-bin dcmimgle-install-bin dcmsr-install-bin dcmsign-install-bin dcmpstat-install-bin dcmimage-install-bin dcmjpeg-install-bin dcmjpls-install-bin
-+install-bin: config-install-bin ofstd-install-bin oflog-install-bin dcmdata-install-bin dcmnet-install-bin dcmtls-install-bin dcmqrdb-install-bin dcmwlm-install-bin dcmimgle-install-bin dcmsr-install-bin dcmsign-install-bin dcmpstat-install-bin dcmimage-install-bin dcmjpeg-install-bin dcmjpls-install-bin
-
--install-doc: config-install-doc ofstd-install-doc oflog-install-doc dcmdata-install-doc dcmtls-install-doc dcmnet-install-doc dcmqrdb-install-doc dcmwlm-install-doc dcmimgle-install-doc dcmsr-install-doc dcmsign-install-doc dcmpstat-install-doc dcmimage-install-doc dcmjpeg-install-doc dcmjpls-install-doc
-+install-doc: config-install-doc ofstd-install-doc oflog-install-doc dcmdata-install-doc dcmnet-install-doc dcmtls-install-doc dcmqrdb-install-doc dcmwlm-install-doc dcmimgle-install-doc dcmsr-install-doc dcmsign-install-doc dcmpstat-install-doc dcmimage-install-doc dcmjpeg-install-doc dcmjpls-install-doc
-
--install-data: config-install-data ofstd-install-data oflog-install-data dcmdata-install-data dcmtls-install-data dcmnet-install-data dcmqrdb-install-data dcmwlm-install-data dcmimgle-install-data dcmsr-install-data dcmsign-install-data dcmpstat-install-data dcmimage-install-data dcmjpeg-install-data dcmjpls-install-data
-+install-data: config-install-data ofstd-install-data oflog-install-data dcmdata-install-data dcmnet-install-data dcmtls-install-data dcmqrdb-install-data dcmwlm-install-data dcmimgle-install-data dcmsr-install-data dcmsign-install-data dcmpstat-install-data dcmimage-install-data dcmjpeg-install-data dcmjpls-install-data
-
- install-etc: config-install-etc ofstd-install-etc oflog-install-etc dcmdata-install-etc dcmtls-install-etc dcmnet-install-etc dcmqrdb-install-etc dcmwlm-install-etc dcmimgle-install-etc dcmsr-install-etc dcmsign-install-etc dcmpstat-install-etc dcmimage-install-etc dcmjpeg-install-etc dcmjpls-install-etc
-
--install-lib: config-install-lib ofstd-install-lib oflog-install-lib dcmdata-install-lib dcmtls-install-lib dcmnet-install-lib dcmqrdb-install-lib dcmwlm-install-lib dcmimgle-install-lib dcmsr-install-lib dcmsign-install-lib dcmpstat-install-lib dcmimage-install-lib dcmjpeg-install-lib dcmjpls-install-lib
-+install-lib: config-install-lib ofstd-install-lib oflog-install-lib dcmdata-install-lib dcmnet-install-lib dcmtls-install-lib dcmqrdb-install-lib dcmwlm-install-lib dcmimgle-install-lib dcmsr-install-lib dcmsign-install-lib dcmpstat-install-lib dcmimage-install-lib dcmjpeg-install-lib dcmjpls-install-lib
-
--install-include: config-install-include ofstd-install-include oflog-install-include dcmdata-install-include dcmtls-install-include dcmnet-install-include dcmqrdb-install-include dcmwlm-install-include dcmimgle-install-include dcmsr-install-include dcmsign-install-include dcmpstat-install-include dcmimage-install-include dcmjpeg-install-include dcmjpls-install-include
-+install-include: config-install-include ofstd-install-include oflog-install-include dcmdata-install-include dcmnet-install-include dcmtls-install-include dcmqrdb-install-include dcmwlm-install-include dcmimgle-install-include dcmsr-install-include dcmsign-install-include dcmpstat-install-include dcmimage-install-include dcmjpeg-install-include dcmjpls-install-include
-
--install-support: config-install-support ofstd-install-support oflog-install-support dcmdata-install-support dcmtls-install-support dcmnet-install-support dcmqrdb-install-support dcmwlm-install-support dcmimgle-install-support dcmsr-install-support dcmsign-install-support dcmpstat-install-support dcmimage-install-support dcmjpeg-install-support dcmjpls-install-support
-+install-support: config-install-support ofstd-install-support oflog-install-support dcmdata-install-support dcmnet-install-support dcmtls-install-support dcmqrdb-install-support dcmwlm-install-support dcmimgle-install-support dcmsr-install-support dcmsign-install-support dcmpstat-install-support dcmimage-install-support dcmjpeg-install-support dcmjpls-install-support
-
- dcmtk-install-doc:
- $(configdir)/mkinstalldirs $(DESTDIR)$(docdir)
---- a/dcmdata/libi2d/Makefile.in
-+++ b/dcmdata/libi2d/Makefile.in
-@@ -17,6 +17,8 @@
- dcmdatadir = $(top_srcdir)/../dcmdata
-
- LOCALINCLUDES = -I$(ofstddir)/include -I$(dcmdatadir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include/libi2d
-+LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc
-+LOCALLIBS = -lofstd -loflog -ldcmdata
- LOCALDEFS =
-
- objs = i2d.o i2dplvlp.o i2djpgs.o i2dbmps.o i2dplsc.o i2dplnsc.o
-@@ -39,7 +41,11 @@
-
-
- $(library): $(objs)
-+ifeq ($(AR),ar)
- $(AR) $(ARFLAGS) $@ $(objs)
-+else
-+ $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS)
-+endif
- $(RANLIB) $@
-
-
---- a/dcmdata/libsrc/Makefile.in
-+++ b/dcmdata/libsrc/Makefile.in
-@@ -66,7 +66,11 @@
-
-
- $(library): $(objs)
-+ifeq ($(AR),ar)
- $(AR) $(ARFLAGS) $@ $(objs)
-+else
-+ $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(ZLIBLIBS)
-+endif
- $(RANLIB) $@
-
- mkdeftag: mkdeftag.o $(dictobjs) $(support_progs_objs)
---- a/dcmimage/libsrc/Makefile.in
-+++ b/dcmimage/libsrc/Makefile.in
-@@ -23,6 +23,8 @@
- # LOCALDEFS = -DREVERSE_OVERLAY_ORIGIN_ORDER
-
- LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include -I$(dcmimgledir)/include
-+LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc -L$(dcmimgledir)/libsrc
-+LOCALLIBS = -lofstd -loflog -ldcmdata -ldcmimgle
-
- objs = dicoimg.o dicopx.o dicoopx.o diregist.o dilogger.o \
- diargimg.o dicmyimg.o dihsvimg.o dipalimg.o dirgbimg.o \
-@@ -40,7 +42,11 @@
-
-
- $(library): $(objs)
-+ifeq ($(AR),ar)
- $(AR) $(ARFLAGS) $@ $(objs)
-+else
-+ $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(PNGLIBS) $(TIFFLIBS)
-+endif
- $(RANLIB) $@
-
-
---- a/dcmimgle/libsrc/Makefile.in
-+++ b/dcmimgle/libsrc/Makefile.in
-@@ -17,6 +17,8 @@
- dcmdatadir = $(top_srcdir)/../dcmdata
-
- LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include
-+LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc
-+LOCALLIBS = -lofstd -loflog -ldcmdata
- LOCALDEFS =
-
- # Special defines for the Library, define them in LOCALDEFS
-@@ -40,7 +42,11 @@
-
-
- $(library): $(objs)
-+ifeq ($(AR),ar)
- $(AR) $(ARFLAGS) $@ $(objs)
-+else
-+ $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(MATHLIBS)
-+endif
- $(RANLIB) $@
-
-
---- a/dcmjpeg/libsrc/Makefile.in
-+++ b/dcmjpeg/libsrc/Makefile.in
-@@ -20,6 +20,9 @@
-
- LOCALINCLUDES = -I$(ofstddir)/include -I$(dcmdatadir)/include -I$(dcmimgledir)/include \
- -I$(dcmjpegdir)/libijg8 -I$(dcmjpegdir)/libijg12 -I$(dcmjpegdir)/libijg16 -I$(oflogdir)/include
-+LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc \
-+ -L$(dcmimgledir)/libsrc -L$(dcmjpegdir)/libijg8 -L$(dcmjpegdir)/libijg12 -L$(dcmjpegdir)/libijg16
-+LOCALLIBS = -lofstd -loflog -ldcmdata -ldcmimgle -lijg8 -lijg12 -lijg16
- LOCALDEFS =
-
- objs = djutils.o djencode.o djrplol.o djrploss.o djcparam.o djeijg8.o djdijg8.o \
-@@ -38,7 +41,11 @@
-
-
- $(library): $(objs)
-+ifeq ($(AR),ar)
- $(AR) $(ARFLAGS) $@ $(objs)
-+else
-+ $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS)
-+endif
- $(RANLIB) $@
-
-
---- a/dcmjpls/libsrc/Makefile.in
-+++ b/dcmjpls/libsrc/Makefile.in
-@@ -19,6 +19,8 @@
-
- LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include \
- -I$(dcmimgledir)/include
-+LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc -L$(dcmimgledir)/libsrc
-+LOCALLIBS = -lofstd -loflog -ldcmdata -ldcmimgle
- LOCALDEFS =
-
- objs = djcodecd.o djcodece.o djcparam.o djdecode.o djencode.o djrparam.o djutils.o
-@@ -35,7 +37,11 @@
-
-
- $(library): $(objs)
-+ifeq ($(AR),ar)
- $(AR) $(ARFLAGS) $@ $(objs)
-+else
-+ $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) -lCharLS
-+endif
- $(RANLIB) $@
-
-
---- a/dcmnet/libsrc/Makefile.in
-+++ b/dcmnet/libsrc/Makefile.in
-@@ -18,6 +18,8 @@
- dcmtlsdir = $(top_srcdir)/../dcmtls
-
- LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include -I$(dcmtlsdir)/include
-+LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc
-+LOCALLIBS = -lofstd -loflog -ldcmdata
- LOCALDEFS =
-
- objs = assoc.o cond.o dcompat.o dimcancl.o dimcmd.o dimdump.o dimecho.o \
-@@ -38,7 +40,11 @@
-
-
- $(library): $(objs)
-+ifeq ($(AR),ar)
- $(AR) $(ARFLAGS) $@ $(objs)
-+else
-+ $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(TCPWRAPPERLIBS) $(OPENSSLLIBS)
-+endif
- $(RANLIB) $@
-
-
---- a/dcmpstat/libsrc/Makefile.in
-+++ b/dcmpstat/libsrc/Makefile.in
-@@ -25,6 +25,10 @@
- LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include \
- -I$(dcmimgledir)/include -I$(dcmsrdir)/include -I$(dcmqrdbdir)/include \
- -I$(dcmnetdir)/include -I$(dcmsigndir)/include -I$(dcmtlsdir)/include
-+LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc \
-+ -L$(dcmimgledir)/libsrc -L$(dcmsrdir)/libsrc -L$(dcmqrdbdir)/libsrc \
-+ -L$(dcmnetdir)/libsrc -L$(dcmsigndir)/libsrc -L$(dcmtlsdir)/libsrc
-+LOCALLIBS = -lofstd -loflog -ldcmdata -ldcmimgle -ldcmsr -ldcmqrdb -ldcmnet -ldcmdsig -ldcmtls
- LOCALDEFS =
-
- objs = dvpsal.o dvpsgal.o dvpsgr.o dvpsovl.o dvpsrs.o dvpstx.o \
-@@ -47,7 +51,11 @@
-
-
- $(library): $(objs)
-+ifeq ($(AR),ar)
- $(AR) $(ARFLAGS) $@ $(objs)
-+else
-+ $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(OPENSSLLIBS) $(MATHLIBS)
-+endif
- $(RANLIB) $@
-
-
---- a/dcmqrdb/libsrc/Makefile.in
-+++ b/dcmqrdb/libsrc/Makefile.in
-@@ -19,6 +19,8 @@
-
- LOCALINCLUDES = -I$(dcmnetdir)/include -I$(dcmdatadir)/include \
- -I$(ofstddir)/include -I$(oflogdir)/include
-+LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc -L$(dcmnetdir)/libsrc
-+LOCALLIBS = -lofstd -loflog -ldcmdata -ldcmnet
- LOCALDEFS =
-
- objs = dcmqrcbf.o dcmqrcbg.o dcmqrcbm.o dcmqrcbs.o dcmqrcnf.o dcmqrdbi.o \
-@@ -35,7 +37,11 @@
-
-
- $(library): $(objs)
-+ifeq ($(AR),ar)
- $(AR) $(ARFLAGS) $@ $(objs)
-+else
-+ $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS)
-+endif
- $(RANLIB) $@
-
-
---- a/dcmsr/libsrc/Makefile.in
-+++ b/dcmsr/libsrc/Makefile.in
-@@ -17,6 +17,8 @@
- dcmdatadir = $(top_srcdir)/../dcmdata
-
- LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include
-+LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc
-+LOCALLIBS = -lofstd -loflog -ldcmdata
- LOCALDEFS =
-
- objs = dsrdoc.o dsrtree.o dsrtncsr.o dsrdoctn.o dsrdoctr.o \
-@@ -41,7 +43,11 @@
-
-
- $(library): $(objs)
-+ifeq ($(AR),ar)
- $(AR) $(ARFLAGS) $@ $(objs)
-+else
-+ $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(XMLLIBS)
-+endif
- $(RANLIB) $@
-
-
---- a/dcmtls/libsrc/Makefile.in
-+++ b/dcmtls/libsrc/Makefile.in
-@@ -18,6 +18,8 @@
- dcmnetdir = $(top_srcdir)/../dcmnet
-
- LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include -I$(dcmnetdir)/include
-+LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc -L$(dcmnetdir)/libsrc
-+LOCALLIBS = -lofstd -loflog -ldcmdata -ldcmnet
- LOCALDEFS =
-
- objs = tlstrans.o tlslayer.o tlsscu.o
-@@ -33,7 +35,11 @@
-
-
- $(library): $(objs)
-+ifeq ($(AR),ar)
- $(AR) $(ARFLAGS) $@ $(objs)
-+else
-+ $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(OPENSSLLIBS)
-+endif
- $(RANLIB) $@
-
-
---- a/dcmwlm/libsrc/Makefile.in
-+++ b/dcmwlm/libsrc/Makefile.in
-@@ -19,6 +19,8 @@
-
- LOCALINCLUDES = -I$(dcmdatadir)/include -I$(dcmnetdir)/include \
- -I$(oflogdir)/include -I$(ofstddir)/include
-+LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc -L$(dcmnetdir)/libsrc
-+LOCALLIBS = -lofstd -loflog -ldcmdata -ldcmnet
- LOCALDEFS =
-
- objs = wlds.o wlmactmg.o wldsfs.o wlfsim.o
-@@ -34,7 +36,11 @@
-
-
- $(library): $(objs)
-+ifeq ($(AR),ar)
- $(AR) $(ARFLAGS) $@ $(objs)
-+else
-+ $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS)
-+endif
- $(RANLIB) $@
-
-
---- a/oflog/libsrc/Makefile.in
-+++ b/oflog/libsrc/Makefile.in
-@@ -15,6 +15,8 @@
- ofstddir = $(top_srcdir)/../ofstd
-
- LOCALINCLUDES = -I$(ofstddir)/include
-+LIBDIRS = -L$(ofstddir)/libsrc
-+LOCALLIBS = -lofstd
- LOCALDEFS =
-
- objs = oflog.o apndimpl.o appender.o config.o consap.o \
-@@ -36,7 +38,11 @@
-
-
- $(library): $(objs)
-+ifeq ($(AR),ar)
- $(AR) $(ARFLAGS) $@ $(objs)
-+else
-+ $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(LIBS)
-+endif
- $(RANLIB) $@
-
diff -Nru dcmtk-3.6.0/debian/rules dcmtk-3.6.0/debian/rules
--- dcmtk-3.6.0/debian/rules 2012-12-20 13:22:26.000000000 +0100
+++ dcmtk-3.6.0/debian/rules 2012-05-31 12:23:17.000000000 +0200
@@ -20,7 +20,9 @@
# Library version
LIB_VERSION=2.0.0
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,--no-undefined
+# the build system is currently too complex to modify to handle --no-undefined
+# leave undefined symbols for now
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed #-Wl,--no-undefined
# build system is too complex to modify for support -fPIE to exe and -fPIC to
# shared libs we would need to use libtool or equivalent to filter shared libs
# from exe
@@ -83,7 +85,7 @@
mv config/Makefile.def config/Makefile.def.static && \
sed -e '/^CFLAGS =/s/-O -/-fPIC -/' -e '/^CXXFLAGS =/s/-O -/-fPIC -/' \
- -e '/^AR =/s/ar/g++/' -e '/^ARFLAGS =/s/cruv/$(LDFLAGS) -shared -Wl,-soname,\$$\@.2 -o/' \
+ -e '/^AR =/s/ar/gcc/' -e '/^ARFLAGS =/s/cruv/-lstdc++ -lz -lxml2 -lpthread -lssl -lcrypto $(LDFLAGS) -shared -Wl,-soname,\$$\@.2 -o/' \
-e '/^LIBEXT =/s/a/so/' -e '/^RANLIB =/s/ranlib/:/' \
<config/Makefile.def.static >config/Makefile.def && \
$(MAKE) libsrc-all && \
--- End Message ---
