rev 10251 - branches/kde4/cdbs

Modestas Vainius modax-guest at alioth.debian.org
Thu Apr 24 21:35:21 UTC 2008


Author: modax-guest
Date: 2008-04-24 21:35:20 +0000 (Thu, 24 Apr 2008)
New Revision: 10251

Modified:
   branches/kde4/cdbs/kde.mk
Log:
Provide a way to disable linking with --as-needed (which is on by default) via DEB_KDE_LINK_WITH_AS_NEEDED := no in debian/rules or DEB_BUILD_OPTIONS="no-as-needed"

Modified: branches/kde4/cdbs/kde.mk
===================================================================
--- branches/kde4/cdbs/kde.mk	2008-04-24 16:59:34 UTC (rev 10250)
+++ branches/kde4/cdbs/kde.mk	2008-04-24 21:35:20 UTC (rev 10251)
@@ -16,11 +16,25 @@
 			-DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML \
 			-DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \
 			-DLIB_INSTALL_DIR=/usr/lib \
-			-DSYSCONF_INSTALL_DIR=/etc \
-			-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
-			-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
-			-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
+			-DSYSCONF_INSTALL_DIR=/etc
 
+# Set the one below to something else than 'yes' to disable linking 
+# with --as-needed (on by default)
+DEB_KDE_LINK_WITH_AS_NEEDED ?= yes
+ifneq (,$(findstring yes, $(DEB_KDE_LINK_WITH_AS_NEEDED)))
+	ifeq (,$(findstring no-as-needed, $(DEB_BUILD_OPTIONS)))
+		DEB_KDE_LINK_WITH_AS_NEEDED := yes
+		DEB_CMAKE_EXTRA_FLAGS += \
+					-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
+					-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
+					-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
+	else
+		DEB_KDE_LINK_WITH_AS_NEEDED := no
+	endif
+else
+	DEB_KDE_LINK_WITH_AS_NEEDED := no
+endif
+
 #DEB_CMAKE_PREFIX = /usr/lib/kde4
 DEB_DH_INSTALL_SOURCEDIR = debian/tmp
 #DEB_DH_SHLIBDEPS_ARGS = -l/usr/lib/kde4/lib/




More information about the pkg-kde-commits mailing list