rev 12485 - in branches/kde4/packages/pkg-kde-tools/trunk: debian makefiles/1

[Sune Vuorela]

Author: pusling-guest
Date: 2008-10-29 17:19:02 +0000 (Wed, 29 Oct 2008)
New Revision: 12485

Modified:
   branches/kde4/packages/pkg-kde-tools/trunk/debian/changelog
   branches/kde4/packages/pkg-kde-tools/trunk/debian/rules
   branches/kde4/packages/pkg-kde-tools/trunk/makefiles/1/variables.mk
Log:
* The no .svn dir in release release.
* Add a way to set --as-needed during build.
* there was a reference to ENABLE_FINAL in variables.mk. Kill it.

Modified: branches/kde4/packages/pkg-kde-tools/trunk/debian/changelog
===================================================================
--- branches/kde4/packages/pkg-kde-tools/trunk/debian/changelog	2008-10-28 11:54:24 UTC (rev 12484)
+++ branches/kde4/packages/pkg-kde-tools/trunk/debian/changelog	2008-10-29 17:19:02 UTC (rev 12485)
@@ -1,3 +1,11 @@
+pkg-kde-tools (0.2) unstable; urgency=low
+
+  * The no .svn dir in release release.
+  * Add a way to set --as-needed during build.
+  * there was a reference to ENABLE_FINAL in variables.mk. Kill it.
+
+ -- Sune Vuorela <debian at pusling.com>  Wed, 29 Oct 2008 17:35:13 +0100
+
 pkg-kde-tools (0.1) unstable; urgency=low
 
   * Initial Release.

Modified: branches/kde4/packages/pkg-kde-tools/trunk/debian/rules
===================================================================
--- branches/kde4/packages/pkg-kde-tools/trunk/debian/rules	2008-10-28 11:54:24 UTC (rev 12484)
+++ branches/kde4/packages/pkg-kde-tools/trunk/debian/rules	2008-10-29 17:19:02 UTC (rev 12485)
@@ -17,6 +17,9 @@
 	dh_installdocs
 	dh_installexamples
 	dh_install
+	#make sure we didn't accidentally add svn files
+	#if triggered, please build source package with -I
+	test ! -e $(CURDIR)/debian/pkg-kde-tools/usr/share/pkg-kde-tools/makefiles/1/.svn/
 	dh_link
 	dh_strip
 	dh_compress

Modified: branches/kde4/packages/pkg-kde-tools/trunk/makefiles/1/variables.mk
===================================================================
--- branches/kde4/packages/pkg-kde-tools/trunk/makefiles/1/variables.mk	2008-10-28 11:54:24 UTC (rev 12484)
+++ branches/kde4/packages/pkg-kde-tools/trunk/makefiles/1/variables.mk	2008-10-29 17:19:02 UTC (rev 12485)
@@ -4,7 +4,6 @@
 # Standard Debian KDE 4 cmake flags
 DEB_CMAKE_KDE4_FLAGS += \
         -DCMAKE_BUILD_TYPE=Debian \
-        -DKDE4_ENABLE_FINAL=$(KDE4-ENABLE-FINAL) \
         -DKDE4_BUILD_TESTS=false \
         -DKDE_DISTRIBUTION_TEXT="Debian packages" \
         -DKDE_DEFAULT_HOME=.kde4 \
@@ -16,3 +15,20 @@
         -DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \
         -DLIB_INSTALL_DIR=/usr/lib \
         -DSYSCONF_INSTALL_DIR=/etc
+
+# Set hhe DEB_KDE_LINK_WITH_AS_NEEDED to 'yes' to enable linking
+# with --as-needed (off by default)
+DEB_KDE_LINK_WITH_AS_NEEDED ?= no
+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_CUSTOM_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