Author: branden
Date: 2003-06-14 05:45:34 -0500 (Sat, 14 Jun 2003)
New Revision: 204
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/909_debian_piclib_support.diff
Log:
debian/patches/909_debian_piclib_support.diff: rework support for static
libraries with PIC info; by default, only libraries without a shared
version build static-PIC versions, and then only on systems where PIC info
is not included in static ("normal") libraries by default (such as Debian)
Modified: branches/4.3.0/sid/debian/patches/909_debian_piclib_support.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/909_debian_piclib_support.diff 2003-06-14
10:25:10 UTC (rev 203)
+++ branches/4.3.0/sid/debian/patches/909_debian_piclib_support.diff 2003-06-14
10:45:34 UTC (rev 204)
@@ -1,11 +1,15 @@
This patch by Matthieu Herrb, Branden Robinson, ISHIKAWA Mutsumi, and
LaMont Jones.
-Submitted as #5381. Apparently rejected. Edited since then to PICify
-Xinerama and libxkbfile as well.
+An earlier version was submitted as #5381. Apparently rejected.
-(Updated for XFree86 4.3.0 at Jun, 12 2003)
+Defines a new macro, PicLibraryTarget, which creates static objects with
+PIC info, used for objects with special requirements.
+By default, only libraries without a shared version build static-PIC
+versions, and then only on architectures where PIC info is not included in
+static ("normal") libraries by default.
+
diff -urN xc.orig/config/cf/Imake.rules xc/config/cf/Imake.rules
--- xc.orig/config/cf/Imake.rules 2003-06-12 20:08:46.000000000 +0900
+++ xc/config/cf/Imake.rules 2003-06-12 20:14:17.000000000 +0900
@@ -30,29 +34,25 @@
* SubdirLibraryRule -
*/
#ifndef SubdirLibraryRule
-diff -urN xc.orig/config/cf/Library.tmpl xc/config/cf/Library.tmpl
---- xc.orig/config/cf/Library.tmpl 2003-02-21 14:30:20.000000000 +0900
-+++ xc/config/cf/Library.tmpl 2003-06-12 20:17:02.000000000 +0900
-@@ -3,7 +3,7 @@
- * that Imakefiles in the various library subtrees will need.
- *
- * Before including this, you must set the following boolean variables:
-- * DoNormalLib, DoSharedLib, DoDebugLib, DoProfileLib
-+ * DoNormalLib, DoSharedLib, DoDebugLib, DoProfileLib, DoPicLib
- *
- * To get automatic generation of standard rules, also set the variables:
- * LibName, SoRev, HasSharedData, and optionally HugeLibrary and IncSubdir.
-@@ -52,8 +52,15 @@
- SHLIBGLOBALSFLAGS = ShlibGlobalsFlags
+--- xc/config/cf/Library.tmpl~ 2003-06-14 05:23:52.000000000 -0500
++++ xc/config/cf/Library.tmpl 2003-06-14 05:33:43.000000000 -0500
+@@ -37,6 +37,13 @@
+ #define DoExtraLib NO
#endif
-+/*
-+ * Some libraries may not define DoPicLib
-+ */
+#ifndef DoPicLib
-+# define DoPicLib NO
++# ifdef DoNormalLib && !DoSharedLib && !StaticNeedsPicForShared
++# define DoPicLib YES
++# else
++# define DoPicLib NO
+#endif
+
+ #ifndef HasSharedData
+ #define HasSharedData NO
+ #endif
+@@ -53,7 +60,7 @@
+ #endif
+
#ifndef LibraryCplusplusOptions
-# if DoSharedLib && defined(SharedLibraryCplusplusOptions)
+# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusOptions)
@@ -142,126 +142,3 @@
# if DoExtraLib && defined(ExtraLibRules)
ExtraLibraryTarget($(LIBNAME),$(SoRev),$(OBJS) $(EXTRAUNSHAREDOBJS))
# if !defined(LibInstall) || LibInstall
-diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
---- xc.orig/config/cf/X11.tmpl 2003-06-12 20:08:48.000000000 +0900
-+++ xc/config/cf/X11.tmpl 2003-06-12 20:14:17.000000000 +0900
-@@ -1652,6 +1652,9 @@
- #ifndef BuildLibPathVar
- #define BuildLibPathVar LD_LIBRARY_PATH
- #endif
-+#ifndef PicLibXxf86vm
-+#define PicLibXxf86vm YES
-+#endif
- #endif
- #endif
- #ifdef BuildLibPathVar
-@@ -2533,6 +2536,12 @@
- #else
- ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),$(USRLIBDIR))
- #endif
-+#ifndef PicLibXxf86dga
-+#define PicLibXxf86dga YES
-+#endif
-+#ifndef PicLibXv
-+#define PicLibXv YES
-+#endif
- #endif
-
- #ifndef SharedLibXdmcp
-@@ -2559,6 +2568,9 @@
- #else
- ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR))
- #endif
-+#ifndef PicLibXvMC
-+#define PicLibXvMC YES
-+#endif
- #endif
-
- #ifndef SharedLibXmu
-@@ -2745,6 +2757,9 @@
- #else
- ProjectUnsharedLibReferences(XAW6,Xaw,$(AWIDGET6SRC),XBuildLibDir)
- #endif
-+#ifndef PicLibXinerama
-+#define PicLibXinerama YES
-+#endif
- #endif
-
- #ifndef SharedLibXi
-diff -urN xc.orig/lib/Xinerama/Imakefile xc/lib/Xinerama/Imakefile
---- xc.orig/lib/Xinerama/Imakefile 2003-01-04 11:48:24.000000000 +0900
-+++ xc/lib/Xinerama/Imakefile 2003-06-12 20:14:17.000000000 +0900
-@@ -4,6 +4,7 @@
- #define DoSharedLib SharedLibXinerama
- #define DoDebugLib DebugLibXinerama
- #define DoProfileLib ProfileLibXinerama
-+#define DoPicLib PicLibXinerama
- #define LibName Xinerama
- #define SoRev SOXINERAMAREV
- #define LibHeaders NO
-diff -urN xc.orig/lib/Xv/Imakefile xc/lib/Xv/Imakefile
---- xc.orig/lib/Xv/Imakefile 2003-01-04 11:48:24.000000000 +0900
-+++ xc/lib/Xv/Imakefile 2003-06-12 20:14:17.000000000 +0900
-@@ -4,6 +4,7 @@
- #define DoSharedLib SharedLibXv
- #define DoDebugLib DebugLibXv
- #define DoProfileLib ProfileLibXv
-+#define DoPicLib PicLibXv
- #define LibName Xv
- #define SoRev SOXVREV
- #define LibHeaders NO
-diff -urN xc.orig/lib/XvMC/Imakefile xc/lib/XvMC/Imakefile
---- xc.orig/lib/XvMC/Imakefile 2002-10-16 09:37:33.000000000 +0900
-+++ xc/lib/XvMC/Imakefile 2003-06-12 20:14:17.000000000 +0900
-@@ -4,6 +4,7 @@
- #define DoSharedLib SharedLibXvMC
- #define DoDebugLib DebugLibXvMC
- #define DoProfileLib ProfileLibXvMC
-+#define DoPicLib PicLibXvMC
- #define LibName XvMC
- #define SoRev SOXVMCREV
- #define LibHeaders NO
-diff -urN xc.orig/lib/XvMC/hw/i810/Imakefile xc/lib/XvMC/hw/i810/Imakefile
---- xc.orig/lib/XvMC/hw/i810/Imakefile 2002-10-31 03:42:57.000000000 +0900
-+++ xc/lib/XvMC/hw/i810/Imakefile 2003-06-12 20:14:17.000000000 +0900
-@@ -3,6 +3,7 @@
- #define DoSharedLib SharedLibXvMC
- #define DoDebugLib DebugLibXvMC
- #define DoProfileLib ProfileLibXvMC
-+#define DoPicLib PicLibXvMC
- #define LibName I810XvMC
- #define SoRev SOXVMCREV
- #define LibHeaders NO
-diff -urN xc.orig/lib/Xxf86dga/Imakefile xc/lib/Xxf86dga/Imakefile
---- xc.orig/lib/Xxf86dga/Imakefile 2003-01-04 11:48:25.000000000 +0900
-+++ xc/lib/Xxf86dga/Imakefile 2003-06-12 20:14:17.000000000 +0900
-@@ -4,6 +4,7 @@
- #define DoExtraLib SharedLibXxf86dga
- #define DoDebugLib DebugLibXxf86dga
- #define DoProfileLib ProfileLibXxf86dga
-+#define DoPicLib PicLibXxf86dga
- #define LibName Xxf86dga
- #define SoRev SOXXF86DGAREV
- #define LibHeaders NO
-diff -urN xc.orig/lib/Xxf86vm/Imakefile xc/lib/Xxf86vm/Imakefile
---- xc.orig/lib/Xxf86vm/Imakefile 2003-01-04 11:48:25.000000000 +0900
-+++ xc/lib/Xxf86vm/Imakefile 2003-06-12 20:14:17.000000000 +0900
-@@ -4,6 +4,7 @@
- #define DoExtraLib SharedLibXxf86vm
- #define DoDebugLib DebugLibXxf86vm
- #define DoProfileLib ProfileLibXxf86vm
-+#define DoPicLib PicLibXxf86vm
- #define LibName Xxf86vm
- #define SoRev SOXXF86VMREV
- #define LibHeaders NO
-diff -urN xc.orig/lib/xkbfile/Imakefile xc/lib/xkbfile/Imakefile
---- xc.orig/lib/xkbfile/Imakefile 2001-08-28 02:40:59.000000000 +0900
-+++ xc/lib/xkbfile/Imakefile 2003-06-12 20:14:17.000000000 +0900
-@@ -10,6 +10,7 @@
- #define DoExtraLib NO
- #define DoDebugLib NO
- #define DoProfileLib NO
-+#define DoPicLib YES
- #define HasSharedData NO
- #define LibName xkbfile
- #define SoRev SOXKBFILEREV
Modified: branches/4.3.0/sid/debian/changelog
==============================================================================
--- branches/4.3.0/sid/debian/changelog 2003-06-14 10:25:10 UTC (rev 203)
+++ branches/4.3.0/sid/debian/changelog 2003-06-14 10:45:34 UTC (rev 204)
@@ -37,6 +37,11 @@
* xlibs-pic package renamed to xlibs-static-pic
- reintegrate piclib_support.diff (previously patch #046, now patch #909)
+ * patch #909: rework support for static libraries with PIC info; by default,
+ only libraries without a shared version build static-PIC versions, and
+ then only on systems where PIC info is not included in static ("normal")
+ libraries by default (such as Debian)
+
* debian/control:
- Change all references to libstdc++5-dev to be
libstdc++5-dev | libstdc++-dev, allowing libstdc++5-3.3-dev to satisfy
@@ -46,7 +51,7 @@
* debian/xlibosmesa4-dbg.install: install the unstripped library in
/usr/X11R6/lib/debug, not /usr/X11R6/lib
- -- Branden Robinson <[EMAIL PROTECTED]> Sat, 14 Jun 2003 03:35:19 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Sat, 14 Jun 2003 05:38:31 -0500
xfree86 (4.2.1-8) unstable; urgency=high
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
