r6600 - in packages/trunk/plib/debian: . patches
Bradley Smith
brad-guest at alioth.debian.org
Wed Apr 16 20:51:11 UTC 2008
Author: brad-guest
Date: 2008-04-16 20:51:11 +0000 (Wed, 16 Apr 2008)
New Revision: 6600
Added:
packages/trunk/plib/debian/patches/fix_as-needed
Modified:
packages/trunk/plib/debian/changelog
packages/trunk/plib/debian/patches/build_shared_libs
packages/trunk/plib/debian/patches/series
packages/trunk/plib/debian/rules
Log:
Add fix_as-needed
- Fix ordering for --as-needed in libtool
Modified: packages/trunk/plib/debian/changelog
===================================================================
--- packages/trunk/plib/debian/changelog 2008-04-16 20:41:55 UTC (rev 6599)
+++ packages/trunk/plib/debian/changelog 2008-04-16 20:51:11 UTC (rev 6600)
@@ -4,6 +4,8 @@
* New upstream release. Closes: #475354
* Add build_shared_libs patch
- Build shared libs properly. Closes: #475331, #470503
+ * Add fix_as-needed
+ - Fix ordering for --as-needed in libtool
* Overhaul packaging. Closes: #475356
- Correct debian/control
- Remove unneeded autotools regeneration
Modified: packages/trunk/plib/debian/patches/build_shared_libs
===================================================================
--- packages/trunk/plib/debian/patches/build_shared_libs 2008-04-16 20:41:55 UTC (rev 6599)
+++ packages/trunk/plib/debian/patches/build_shared_libs 2008-04-16 20:51:11 UTC (rev 6600)
@@ -26239,18 +26239,6 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-diff -Naur plib-1.8.5.orig/configure.in plib-1.8.5/configure.in
---- plib-1.8.5.orig/configure.in 2008-04-12 20:16:00.000000000 +0100
-+++ plib-1.8.5/configure.in 2008-04-12 20:18:33.000000000 +0100
-@@ -36,7 +36,7 @@
- AC_PROG_CXX
- AC_PROG_CXXCPP
- AC_PROG_INSTALL
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
-
- dnl Command line arguments
-
diff -Naur plib-1.8.5.orig/ltmain.sh plib-1.8.5/ltmain.sh
--- plib-1.8.5.orig/ltmain.sh 1970-01-01 01:00:00.000000000 +0100
+++ plib-1.8.5/ltmain.sh 2008-04-05 18:05:47.000000000 +0100
@@ -33650,23 +33638,6 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Naur plib-1.8.5.orig/src/fnt/Makefile.am plib-1.8.5/src/fnt/Makefile.am
---- plib-1.8.5.orig/src/fnt/Makefile.am 2008-04-12 20:16:00.000000000 +0100
-+++ plib-1.8.5/src/fnt/Makefile.am 2008-04-12 22:56:33.000000000 +0100
-@@ -1,10 +1,11 @@
- if BUILD_FNT
-
--lib_LIBRARIES = libplibfnt.a
-+lib_LTLIBRARIES = libplibfnt.la
-
- include_HEADERS = fnt.h
-
--libplibfnt_a_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx
-+libplibfnt_la_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx
-+libplibfnt_la_LIBADD = ../util/libplibul.la
-
- INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util
-
diff -Naur plib-1.8.5.orig/src/fnt/Makefile.in plib-1.8.5/src/fnt/Makefile.in
--- plib-1.8.5.orig/src/fnt/Makefile.in 2008-04-12 20:16:00.000000000 +0100
+++ plib-1.8.5/src/fnt/Makefile.in 2008-04-12 22:59:06.000000000 +0100
@@ -34155,25 +34126,6 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Naur plib-1.8.5.orig/src/js/Makefile.am plib-1.8.5/src/js/Makefile.am
---- plib-1.8.5.orig/src/js/Makefile.am 2008-04-12 20:16:00.000000000 +0100
-+++ plib-1.8.5/src/js/Makefile.am 2008-04-12 22:56:57.000000000 +0100
-@@ -1,12 +1,13 @@
- if BUILD_JS
-
--lib_LIBRARIES = libplibjs.a
-+lib_LTLIBRARIES = libplibjs.la
-
- include_HEADERS = js.h
-
--libplibjs_a_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \
-+libplibjs_la_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \
- jsMacOSX.cxx jsWindows.cxx jsBSD.cxx \
- jsNone.cxx
-+libplibjs_la_LIBADD = ../util/libplibul.la
-
- INCLUDES = -I$(top_srcdir)/src/util
-
diff -Naur plib-1.8.5.orig/src/js/Makefile.in plib-1.8.5/src/js/Makefile.in
--- plib-1.8.5.orig/src/js/Makefile.in 2008-04-12 20:16:00.000000000 +0100
+++ plib-1.8.5/src/js/Makefile.in 2008-04-12 22:59:06.000000000 +0100
@@ -34668,12 +34620,6 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Naur plib-1.8.5.orig/src/Makefile.am plib-1.8.5/src/Makefile.am
---- plib-1.8.5.orig/src/Makefile.am 2008-04-12 20:16:00.000000000 +0100
-+++ plib-1.8.5/src/Makefile.am 2008-04-12 21:54:14.000000000 +0100
-@@ -1 +1 @@
--SUBDIRS = util js sl pui puAux sg ssg fnt ssgAux net psl pw
-+SUBDIRS = util fnt sg js sl pui puAux ssg ssgAux net psl pw
diff -Naur plib-1.8.5.orig/src/Makefile.in plib-1.8.5/src/Makefile.in
--- plib-1.8.5.orig/src/Makefile.in 2008-04-12 20:16:00.000000000 +0100
+++ plib-1.8.5/src/Makefile.in 2008-04-12 22:59:06.000000000 +0100
@@ -35031,25 +34977,6 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Naur plib-1.8.5.orig/src/net/Makefile.am plib-1.8.5/src/net/Makefile.am
---- plib-1.8.5.orig/src/net/Makefile.am 2008-04-12 20:16:00.000000000 +0100
-+++ plib-1.8.5/src/net/Makefile.am 2008-04-12 22:57:02.000000000 +0100
-@@ -1,12 +1,13 @@
- if BUILD_NET
-
--lib_LIBRARIES = libplibnet.a
-+lib_LTLIBRARIES = libplibnet.la
-
- include_HEADERS = netBuffer.h netChannel.h netChat.h netMessage.h \
- netMonitor.h netSocket.h net.h
-
--libplibnet_a_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \
-+libplibnet_la_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \
- netMessage.cxx netMonitor.cxx netSocket.cxx
-+libplibnet_la_LIBADD = ../util/libplibul.la
-
- INCLUDES = -I$(top_srcdir)/src/util
-
diff -Naur plib-1.8.5.orig/src/net/Makefile.in plib-1.8.5/src/net/Makefile.in
--- plib-1.8.5.orig/src/net/Makefile.in 2008-04-12 20:16:00.000000000 +0100
+++ plib-1.8.5/src/net/Makefile.in 2008-04-12 22:59:06.000000000 +0100
@@ -35541,29 +35468,6 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Naur plib-1.8.5.orig/src/psl/Makefile.am plib-1.8.5/src/psl/Makefile.am
---- plib-1.8.5.orig/src/psl/Makefile.am 2008-04-12 20:16:00.000000000 +0100
-+++ plib-1.8.5/src/psl/Makefile.am 2008-04-12 22:58:54.000000000 +0100
-@@ -1,16 +1,17 @@
-
- if BUILD_PSL
-
--lib_LIBRARIES = libplibpsl.a
-+lib_LTLIBRARIES = libplibpsl.la
-
- include_HEADERS = psl.h
-
--libplibpsl_a_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \
-+libplibpsl_la_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \
- pslCompiler.cxx pslSymbols.cxx pslToken.cxx \
- pslExpression.cxx pslProgram.cxx pslDump.cxx \
- pslError.cxx pslFileIO.cxx pslCompiler.h \
- pslContext.h pslFileIO.h pslLocal.h \
- pslOpcodes.h pslSymbol.h
-+libplibpsl_la_LIBADD = ../util/libplibul.la
-
- INCLUDES = -I$(top_srcdir)/src/util
-
diff -Naur plib-1.8.5.orig/src/psl/Makefile.in plib-1.8.5/src/psl/Makefile.in
--- plib-1.8.5.orig/src/psl/Makefile.in 2008-04-12 20:16:00.000000000 +0100
+++ plib-1.8.5/src/psl/Makefile.in 2008-04-12 22:59:06.000000000 +0100
@@ -36083,31 +35987,6 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Naur plib-1.8.5.orig/src/puAux/Makefile.am plib-1.8.5/src/puAux/Makefile.am
---- plib-1.8.5.orig/src/puAux/Makefile.am 2008-04-12 20:16:00.000000000 +0100
-+++ plib-1.8.5/src/puAux/Makefile.am 2008-04-12 22:59:01.000000000 +0100
-@@ -1,10 +1,10 @@
- if BUILD_PUAUX
-
--lib_LIBRARIES = libplibpuaux.a
-+lib_LTLIBRARIES = libplibpuaux.la
-
- include_HEADERS = puAux.h puAuxLocal.h
-
--libplibpuaux_a_SOURCES = puAux.cxx \
-+libplibpuaux_la_SOURCES = puAux.cxx \
- puAuxBiSlider.cxx \
- puAuxBiSliderWithEnds.cxx \
- puAuxComboBox.cxx \
-@@ -19,6 +19,8 @@
- puAuxTriSlider.cxx \
- puAuxVerticalMenu.cxx \
- puAuxChooser.cxx
-+libplibpuaux_la_LIBADD = ../util/libplibul.la ../pui/libplibpu.la \
-+ ../fnt/libplibfnt.la ../sg/libplibsg.la
-
- INCLUDES = -I$(top_srcdir)/src/sg \
- -I$(top_srcdir)/src/pui \
diff -Naur plib-1.8.5.orig/src/puAux/Makefile.in plib-1.8.5/src/puAux/Makefile.in
--- plib-1.8.5.orig/src/puAux/Makefile.in 2008-04-12 20:16:00.000000000 +0100
+++ plib-1.8.5/src/puAux/Makefile.in 2008-04-12 22:59:06.000000000 +0100
@@ -36645,30 +36524,6 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Naur plib-1.8.5.orig/src/pui/Makefile.am plib-1.8.5/src/pui/Makefile.am
---- plib-1.8.5.orig/src/pui/Makefile.am 2008-04-12 20:16:00.000000000 +0100
-+++ plib-1.8.5/src/pui/Makefile.am 2008-04-12 22:58:10.000000000 +0100
-@@ -1,10 +1,10 @@
- if BUILD_PUI
-
--lib_LIBRARIES = libplibpu.a
-+lib_LTLIBRARIES = libplibpu.la
-
- include_HEADERS = pu.h puGLUT.h puFLTK.h puSDL.h puNative.h puPW.h
-
--libplibpu_a_SOURCES = \
-+libplibpu_la_SOURCES = \
- pu.cxx puBox.cxx puButton.cxx puButtonBox.cxx \
- puArrowButton.cxx puDialogBox.cxx puFrame.cxx puGroup.cxx \
- puInput.cxx puInterface.cxx puLocal.h puMenuBar.cxx \
-@@ -14,6 +14,7 @@
- puDial.cxx \
- puRange.cxx \
- puInputBase.cxx
-+libplibpu_la_LIBADD = ../util/libplibul.la ../fnt/libplibfnt.la
-
- AM_CPPFLAGS = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/fnt
- AM_CPPFLAGS += -I$(top_srcdir)/src/util
diff -Naur plib-1.8.5.orig/src/pui/Makefile.in plib-1.8.5/src/pui/Makefile.in
--- plib-1.8.5.orig/src/pui/Makefile.in 2008-04-12 20:16:00.000000000 +0100
+++ plib-1.8.5/src/pui/Makefile.in 2008-04-12 22:59:07.000000000 +0100
@@ -37226,22 +37081,6 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Naur plib-1.8.5.orig/src/pw/Makefile.am plib-1.8.5/src/pw/Makefile.am
---- plib-1.8.5.orig/src/pw/Makefile.am 2008-04-12 20:16:00.000000000 +0100
-+++ plib-1.8.5/src/pw/Makefile.am 2008-04-12 22:42:43.000000000 +0100
-@@ -1,10 +1,10 @@
- if BUILD_PW
-
--lib_LIBRARIES = libplibpw.a
-+lib_LTLIBRARIES = libplibpw.la
-
- include_HEADERS = pw.h
-
--libplibpw_a_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx
-+libplibpw_la_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx
-
- INCLUDES = -I$(top_srcdir)/src/util
-
diff -Naur plib-1.8.5.orig/src/pw/Makefile.in plib-1.8.5/src/pw/Makefile.in
--- plib-1.8.5.orig/src/pw/Makefile.in 2008-04-12 20:16:00.000000000 +0100
+++ plib-1.8.5/src/pw/Makefile.in 2008-04-12 22:59:07.000000000 +0100
@@ -37721,25 +37560,6 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Naur plib-1.8.5.orig/src/sg/Makefile.am plib-1.8.5/src/sg/Makefile.am
---- plib-1.8.5.orig/src/sg/Makefile.am 2008-04-12 20:16:00.000000000 +0100
-+++ plib-1.8.5/src/sg/Makefile.am 2008-04-12 22:57:24.000000000 +0100
-@@ -1,12 +1,13 @@
- if BUILD_SG
-
--lib_LIBRARIES = libplibsg.a
-+lib_LTLIBRARIES = libplibsg.la
-
- include_HEADERS = sg.h
-
--libplibsg_a_SOURCES = sg.cxx sgd.cxx \
-+libplibsg_la_SOURCES = sg.cxx sgd.cxx \
- sgIsect.cxx sgdIsect.cxx \
- sgPerlinNoise.cxx
-+libplibsg_la_LIBADD = ../util/libplibul.la
-
- INCLUDES = -I$(top_srcdir)/src/util
-
diff -Naur plib-1.8.5.orig/src/sg/Makefile.in plib-1.8.5/src/sg/Makefile.in
--- plib-1.8.5.orig/src/sg/Makefile.in 2008-04-12 20:16:00.000000000 +0100
+++ plib-1.8.5/src/sg/Makefile.in 2008-04-12 22:59:07.000000000 +0100
@@ -38227,30 +38047,6 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Naur plib-1.8.5.orig/src/sl/Makefile.am plib-1.8.5/src/sl/Makefile.am
---- plib-1.8.5.orig/src/sl/Makefile.am 2008-04-12 20:16:00.000000000 +0100
-+++ plib-1.8.5/src/sl/Makefile.am 2008-04-12 22:57:28.000000000 +0100
-@@ -1,16 +1,17 @@
- if BUILD_SL
-
--lib_LIBRARIES = libplibsl.a libplibsm.a
-+lib_LTLIBRARIES = libplibsl.la libplibsm.la
-
- include_HEADERS = sl.h slPortability.h sm.h
-
--libplibsl_a_SOURCES = \
-+libplibsl_la_SOURCES = \
- slDSP.cxx slSample.cxx slEnvelope.cxx \
- slPlayer.cxx slMODPlayer.cxx slSamplePlayer.cxx \
- slScheduler.cxx slMODdacio.cxx slMODfile.cxx \
- slMODinst.cxx slMODnote.cxx slMODPrivate.h slMODfile.h
-+libplibsl_la_LIBADD = ../util/libplibul.la
-
--libplibsm_a_SOURCES = slPortability.h smMixer.cxx
-+libplibsm_la_SOURCES = slPortability.h smMixer.cxx
-
- INCLUDES = -I$(top_srcdir)/src/util
-
diff -Naur plib-1.8.5.orig/src/sl/Makefile.in plib-1.8.5/src/sl/Makefile.in
--- plib-1.8.5.orig/src/sl/Makefile.in 2008-04-12 20:16:00.000000000 +0100
+++ plib-1.8.5/src/sl/Makefile.in 2008-04-12 22:59:07.000000000 +0100
@@ -38790,30 +38586,6 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Naur plib-1.8.5.orig/src/ssg/Makefile.am plib-1.8.5/src/ssg/Makefile.am
---- plib-1.8.5.orig/src/ssg/Makefile.am 2008-04-12 20:16:00.000000000 +0100
-+++ plib-1.8.5/src/ssg/Makefile.am 2008-04-12 22:57:39.000000000 +0100
-@@ -1,10 +1,10 @@
- if BUILD_SSG
-
--lib_LIBRARIES = libplibssg.a
-+lib_LTLIBRARIES = libplibssg.la
-
- include_HEADERS = ssg.h ssgconf.h ssgMSFSPalette.h ssgKeyFlier.h pcx.h
-
--libplibssg_a_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \
-+libplibssg_la_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \
- ssgBaseTransform.cxx ssgBranch.cxx ssgContext.cxx ssgCutout.cxx \
- ssgDList.cxx ssgEntity.cxx ssgIsect.cxx ssgLeaf.cxx ssgList.cxx \
- ssgLoadDOF.cxx ssgLoadAC.cxx \
-@@ -28,6 +28,7 @@
- ssgLoadMDL_BGLTexture.cxx ssgLoadXPlaneObj.cxx ssgLoadASC.cxx ssgSaveASC.cxx \
- ssgSaveIV.cxx ssgAnimTransform.cxx\
- ssgVertSplitter.h ssgVertSplitter.cxx ssgStatistics.cxx
-+libplibssg_la_LIBADD = ../util/libplibul.la ../sg/libplibsg.la
-
- INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util
-
diff -Naur plib-1.8.5.orig/src/ssg/Makefile.in plib-1.8.5/src/ssg/Makefile.in
--- plib-1.8.5.orig/src/ssg/Makefile.in 2008-04-12 20:16:00.000000000 +0100
+++ plib-1.8.5/src/ssg/Makefile.in 2008-04-12 22:59:07.000000000 +0100
@@ -39545,35 +39317,6 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Naur plib-1.8.5.orig/src/ssgAux/Makefile.am plib-1.8.5/src/ssgAux/Makefile.am
---- plib-1.8.5.orig/src/ssgAux/Makefile.am 2008-04-12 20:16:00.000000000 +0100
-+++ plib-1.8.5/src/ssgAux/Makefile.am 2008-04-12 22:58:22.000000000 +0100
-@@ -1,6 +1,6 @@
- if BUILD_SSGAUX
-
--lib_LIBRARIES = libplibssgaux.a
-+lib_LTLIBRARIES = libplibssgaux.la
-
- include_HEADERS = ssgAux.h \
- ssgaShapes.h \
-@@ -13,7 +13,7 @@
- ssgaFire.h \
- ssgaBillboards.h
-
--libplibssgaux_a_SOURCES = ssgAux.cxx \
-+libplibssgaux_la_SOURCES = ssgAux.cxx \
- ssgaShapes.cxx \
- ssgaPatch.cxx \
- ssgaParticleSystem.cxx \
-@@ -30,6 +30,8 @@
- ssgaSky.cxx \
- ssgaTeapot.cxx \
- ssgaBillboards.cxx
-+libplibssgaux_la_LIBADD = ../util/libplibul.la ../ssg/libplibssg.la \
-+ ../sg/libplibsg.la
-
- INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/ssg
- INCLUDES += -I$(top_srcdir)/src/util
diff -Naur plib-1.8.5.orig/src/ssgAux/Makefile.in plib-1.8.5/src/ssgAux/Makefile.in
--- plib-1.8.5.orig/src/ssgAux/Makefile.in 2008-04-12 20:16:00.000000000 +0100
+++ plib-1.8.5/src/ssgAux/Makefile.in 2008-04-12 22:59:07.000000000 +0100
@@ -40120,22 +39863,6 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Naur plib-1.8.5.orig/src/util/Makefile.am plib-1.8.5/src/util/Makefile.am
---- plib-1.8.5.orig/src/util/Makefile.am 2008-04-12 20:16:00.000000000 +0100
-+++ plib-1.8.5/src/util/Makefile.am 2008-04-12 22:43:09.000000000 +0100
-@@ -1,10 +1,10 @@
- if BUILD_UL
-
--lib_LIBRARIES = libplibul.a
-+lib_LTLIBRARIES = libplibul.la
-
- include_HEADERS = ul.h ulRTTI.h
-
--libplibul_a_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \
-+libplibul_la_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \
- ulList.cxx ulLocal.h ulRTTI.cxx
-
- endif
diff -Naur plib-1.8.5.orig/src/util/Makefile.in plib-1.8.5/src/util/Makefile.in
--- plib-1.8.5.orig/src/util/Makefile.in 2008-04-12 20:16:00.000000000 +0100
+++ plib-1.8.5/src/util/Makefile.in 2008-04-12 22:59:07.000000000 +0100
Added: packages/trunk/plib/debian/patches/fix_as-needed
===================================================================
--- packages/trunk/plib/debian/patches/fix_as-needed (rev 0)
+++ packages/trunk/plib/debian/patches/fix_as-needed 2008-04-16 20:51:11 UTC (rev 6600)
@@ -0,0 +1,30 @@
+--- a/ltmain.sh.orig 2006-03-29 15:45:36.000000000 +0200
++++ b/ltmain.sh 2006-03-29 16:39:30.000000000 +0200
+@@ -1807,6 +1807,11 @@
+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ ;;
+
++ -Wl,--as-needed)
++ deplibs="$deplibs $arg"
++ continue
++ ;;
++
+ -Wl,*)
+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ arg=
+@@ -2150,6 +2155,15 @@
+ lib=
+ found=no
+ case $deplib in
++ -Wl,--as-needed)
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ deplibs="$deplib $deplibs"
++ fi
++ continue
++ ;;
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
Modified: packages/trunk/plib/debian/patches/series
===================================================================
--- packages/trunk/plib/debian/patches/series 2008-04-16 20:41:55 UTC (rev 6599)
+++ packages/trunk/plib/debian/patches/series 2008-04-16 20:51:11 UTC (rev 6600)
@@ -1 +1,2 @@
build_shared_libs
+fix_as-needed
Modified: packages/trunk/plib/debian/rules
===================================================================
--- packages/trunk/plib/debian/rules 2008-04-16 20:41:55 UTC (rev 6599)
+++ packages/trunk/plib/debian/rules 2008-04-16 20:51:11 UTC (rev 6600)
@@ -5,28 +5,25 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-CFLAGS = -Wall -g
-CPPFLAGS = -Wall -g
+CFLAGS = -Wall
LDFLAGS = -Wl,--as-needed
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
- CPPFLAGS += -O0
else
CFLAGS += -O2
- CPPFLAGS += -O2
endif
configure: configure-stamp
configure-stamp: patch
dh_testdir
- LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+ LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" \
./configure --prefix=/usr \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
touch $@
build: build-stamp
-build-stamp: configure
+build-stamp: configure-stamp
dh_testdir
$(MAKE)
touch $@
@@ -38,33 +35,31 @@
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
-install: install-stamp
-install-stamp: build
+install: build
dh_testdir
dh_testroot
dh_clean -k
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
- dh_install --fail-missing
- touch $@
-binary-indep:
+binary-indep: build install
binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_installdirs -a
+ dh_testdir
+ dh_testroot
+ dh_installdirs
dh_installdocs
- dh_installchangelogs -a ChangeLog
- dh_link -a
- dh_strip -a
- dh_compress -a
- dh_shlibdeps -a
- dh_fixperms -a
- dh_installdeb -a
- dh_makeshlibs -a -V 'libplib0 (>= 1.8.5-1)'
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+ dh_install --fail-missing
+ dh_installchangelogs ChangeLog
+ dh_link
+ dh_strip
+ dh_compress
+ dh_shlibdeps
+ dh_fixperms
+ dh_installdeb
+ dh_makeshlibs -V 'libplib0 (>= 1.8.5-1)'
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean binary-indep binary-arch binary configure install
More information about the Pkg-games-commits
mailing list