Date: Tue, 14 Feb 2017 12:09:03 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434080 - in head/devel/dcmtk: . files Message-ID: <201702141209.v1EC93J1019962@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Tue Feb 14 12:09:02 2017 New Revision: 434080 URL: https://svnweb.freebsd.org/changeset/ports/434080 Log: Remove -fPIC and instead prevent linking a static library into a shared library. Modified: head/devel/dcmtk/Makefile head/devel/dcmtk/files/patch-BuildLibrary Modified: head/devel/dcmtk/Makefile ============================================================================== --- head/devel/dcmtk/Makefile Tue Feb 14 11:12:28 2017 (r434079) +++ head/devel/dcmtk/Makefile Tue Feb 14 12:09:02 2017 (r434080) @@ -3,7 +3,7 @@ PORTNAME= dcmtk DISTVERSION= 3.6.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= ftp://dicom.offis.de/pub/dicom/offis/software/${PORTNAME}/${PORTNAME}${PORTVERSION:S/.//g}/ @@ -29,9 +29,6 @@ PLIST_SUB= SHLIBVER=${SHLIBVER} PORTDOCS= * -CFLAGS_aarch64= -fPIC -CFLAGS_amd64= -fPIC - OPTIONS_DEFINE= DOCS post-patch: Modified: head/devel/dcmtk/files/patch-BuildLibrary ============================================================================== --- head/devel/dcmtk/files/patch-BuildLibrary Tue Feb 14 11:12:28 2017 (r434079) +++ head/devel/dcmtk/files/patch-BuildLibrary Tue Feb 14 12:09:02 2017 (r434080) @@ -44,17 +44,15 @@ +BUILD_LIBRARY(dcmdata ${SOURCES}) --- dcmpstat/libsrc/CMakeLists.txt.orig 2005-09-15 08:17:54.000000000 +0000 +++ dcmpstat/libsrc/CMakeLists.txt 2011-01-12 14:00:57.000000000 +0000 -@@ -1,5 +1,6 @@ +@@ -1,5 +1,3 @@ -# create library from source files -ADD_LIBRARY(dcmpstat dcmpstat dviface dvpsab dvpsabl dvpsal dvpsall dvpscf dvpscu dvpscul dvpsda dvpsdal dvpsfs dvpsga dvpsgal dvpsgl dvpsgll dvpsgr dvpsgrl dvpshlp dvpsib dvpsibl dvpsmsg dvpsov dvpsovl dvpspl dvpspl2 dvpspll dvpspr dvpsprt dvpsri dvpsril dvpsrs dvpsrsl dvpssp dvpsspl dvpssv dvpssvl dvpstat dvpstx dvpstxl dvpsvl dvpsvll dvpsvw dvpsvwl dvsighdl) +- +-# declare installation files +-INSTALL_TARGETS(${INSTALL_LIBDIR} dcmpstat) +# invoke macro to build and declare installation files +SET(SOURCES dcmpstat dviface dvpsab dvpsabl dvpsal dvpsall dvpscf dvpscu dvpscul dvpsda dvpsdal dvpsfs dvpsga dvpsgal dvpsgl dvpsgll dvpsgr dvpsgrl dvpshlp dvpsib dvpsibl dvpsmsg dvpsov dvpsovl dvpspl dvpspl2 dvpspll dvpspr dvpsprt dvpsri dvpsril dvpsrs dvpsrsl dvpssp dvpsspl dvpssv dvpssvl dvpstat dvpstx dvpstxl dvpsvl dvpsvll dvpsvw dvpsvwl dvsighdl) +BUILD_LIBRARY(dcmpstat ${SOURCES}) - --# declare installation files --INSTALL_TARGETS(${INSTALL_LIBDIR} dcmpstat) -+TARGET_LINK_LIBRARIES(dcmpstatShared dcmsr) -+TARGET_LINK_LIBRARIES(dcmpstat dcmsr) --- oflog/libsrc/CMakeLists.txt.orig 2010-12-08 13:19:02.000000000 +0000 +++ oflog/libsrc/CMakeLists.txt 2011-01-12 14:00:57.000000000 +0000 @@ -1,4 +1,4 @@
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702141209.v1EC93J1019962>