--- Begin Message ---
Package: dcmtk
Version: 3.6.0-11
Severity: normal
Tags: upstream patch
User: debian-...@lists.debian.org
Usertags: ld-as-needed
Hello,
We're having problems building some packages using dcmtk in Ubuntu,
because dcmtk's libraries are underlinked and that causes build failure
with Ubuntu's default linker settings (--as-needed and
--no-copy-dt-needed-entries). Here's an example, with build logs:
https://launchpad.net/ubuntu/+source/plastimatch/1.5.10+dfsg0-1
So here's a patch that would fix that problem, making all libraries in
dcmtk properly linked. It's based on patch from bug #674586 (that one
only fixed enough to allow dcmtk itself to be built).
So it'll be possible to build with --no-undefined:
diff -Nru dcmtk-3.6.0/debian/rules dcmtk-3.6.0/debian/rules
--- dcmtk-3.6.0/debian/rules 2012-05-31 14:23:17.000000000 +0400
+++ dcmtk-3.6.0/debian/rules 2012-06-16 15:57:08.000000000 +0400
@@ -20,9 +20,7 @@
# Library version
LIB_VERSION=2.0.0
-# 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
+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
@@ -85,7 +83,7 @@
mv config/Makefile.def config/Makefile.def.static && \
sed -e '/^CFLAGS =/s/-O -/-fPIC -/' -e '/^CXXFLAGS =/s/-O -/-fPIC -/' \
- -e '/^AR =/s/ar/gcc/' -e '/^ARFLAGS =/s/cruv/-lstdc++ -lz -lxml2
-lpthread -lssl -lcrypto $(LDFLAGS) -shared -Wl,-soname,\$$\@.2 -o/' \
+ -e '/^AR =/s/ar/g++/' -e '/^ARFLAGS =/s/cruv/$(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 && \
The patch is a bit extensive, so I'm a little hesitant about putting it
straight into Ubuntu; opinions (and/or patch adoption) welcome.
Description: fix underlinked libraries
Each of these libraries is built twice, first as .so with gcc, then as .a with
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
--- dcmtk-3.6.0.orig/dcmsign/libsrc/Makefile.in
+++ dcmtk-3.6.0/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 @@
$(library): $(objs)
+ifeq ($(AR),ar)
$(AR) $(ARFLAGS) $@ $(objs)
+else
+ $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(OPENSSLLIBS)
+endif
$(RANLIB) $@
--- dcmtk-3.6.0.orig/ofstd/libsrc/Makefile.in
+++ dcmtk-3.6.0/ofstd/libsrc/Makefile.in
@@ -29,7 +29,11 @@
$(library): $(objs)
+ifeq ($(AR),ar)
$(AR) $(ARFLAGS) $@ $(objs)
+else
+ $(AR) $(ARFLAGS) $@ $(objs) $(LIBS)
+endif
$(RANLIB) $@
--- dcmtk-3.6.0.orig/Makefile
+++ dcmtk-3.6.0/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)
--- dcmtk-3.6.0.orig/dcmdata/libi2d/Makefile.in
+++ dcmtk-3.6.0/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) $@
--- dcmtk-3.6.0.orig/dcmdata/libsrc/Makefile.in
+++ dcmtk-3.6.0/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)
--- dcmtk-3.6.0.orig/dcmimage/libsrc/Makefile.in
+++ dcmtk-3.6.0/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) $@
--- dcmtk-3.6.0.orig/dcmimgle/libsrc/Makefile.in
+++ dcmtk-3.6.0/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) $@
--- dcmtk-3.6.0.orig/dcmjpeg/libsrc/Makefile.in
+++ dcmtk-3.6.0/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) $@
--- dcmtk-3.6.0.orig/dcmjpls/libsrc/Makefile.in
+++ dcmtk-3.6.0/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) $@
--- dcmtk-3.6.0.orig/dcmnet/libsrc/Makefile.in
+++ dcmtk-3.6.0/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) $@
--- dcmtk-3.6.0.orig/dcmpstat/libsrc/Makefile.in
+++ dcmtk-3.6.0/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) $@
--- dcmtk-3.6.0.orig/dcmqrdb/libsrc/Makefile.in
+++ dcmtk-3.6.0/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) $@
--- dcmtk-3.6.0.orig/dcmsr/libsrc/Makefile.in
+++ dcmtk-3.6.0/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) $@
--- dcmtk-3.6.0.orig/dcmtls/libsrc/Makefile.in
+++ dcmtk-3.6.0/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) $@
--- dcmtk-3.6.0.orig/dcmwlm/libsrc/Makefile.in
+++ dcmtk-3.6.0/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) $@
--- dcmtk-3.6.0.orig/oflog/libsrc/Makefile.in
+++ dcmtk-3.6.0/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) $@
--- End Message ---
