Author: aurel32
Date: 2009-05-03 16:33:37 +0000 (Sun, 03 May 2009)
New Revision: 3441

Added:
   
glibc-package/branches/eglibc-2.9/debian/patches/any/submitted-install-map-files.diff
Modified:
   glibc-package/branches/eglibc-2.9/debian/changelog
   glibc-package/branches/eglibc-2.9/debian/patches/series
Log:
    - Add any/submitted-install-map-files.diff to fix GNU/Hurd builds.



Modified: glibc-package/branches/eglibc-2.9/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.9/debian/changelog  2009-05-01 23:21:34 UTC 
(rev 3440)
+++ glibc-package/branches/eglibc-2.9/debian/changelog  2009-05-03 16:33:37 UTC 
(rev 3441)
@@ -10,6 +10,7 @@
     - Drop any/submitted-getcwd-sys_param_h.diff (merged in eglibc).
     - Add any/submitted-cross-zic.diff to fix biarch builds.
     - Add any/submitted-nss-nsswitch.diff to fix linuxthreads builds.
+    - Add any/submitted-install-map-files.diff to fix GNU/Hurd builds.
     - More tests of flavour/biarch builds are run, update the expected
       testsuite results accordingly.
     - Rename glibc-source package into eglibc-source.

Added: 
glibc-package/branches/eglibc-2.9/debian/patches/any/submitted-install-map-files.diff
===================================================================
--- 
glibc-package/branches/eglibc-2.9/debian/patches/any/submitted-install-map-files.diff
                               (rev 0)
+++ 
glibc-package/branches/eglibc-2.9/debian/patches/any/submitted-install-map-files.diff
       2009-05-03 16:33:37 UTC (rev 3441)
@@ -0,0 +1,21 @@
+2009-05-03  Aurelien Jarno  <[email protected]>
+
+       * Makerules (install-map): Don't install libhurduser.map and
+       libmachuser.map.
+
+--- a/Makerules
++++ b/Makerules
+@@ -911,10 +911,12 @@
+ # libpthread_pic.a breaks mklibs, so don't install it and its map.
+ install-lib := $(install-lib) $(install-lib.so-versioned:%.so=%_pic.a)
+ install-lib := $(filter-out libpthread_pic.a,$(install-lib))
++# Despite having a soname libhurduser and libmachuser do not use symbol
++# versioning, so don't install the corresponding .map files.
+ ifeq ($(versioning),yes)
+ install-map := $(patsubst %.so,%.map,\
+                       $(foreach L,$(install-lib.so-versioned),$(notdir $L)))
+-install-map := $(filter-out libpthread.map,$(install-map))
++install-map := $(filter-out libhurduser.map libmachuser.map 
libpthread.map,$(install-map))
+ ifndef subdir
+ install-map := $(install-map) libc.map
+ endif

Modified: glibc-package/branches/eglibc-2.9/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.9/debian/patches/series     2009-05-01 
23:21:34 UTC (rev 3440)
+++ glibc-package/branches/eglibc-2.9/debian/patches/series     2009-05-03 
16:33:37 UTC (rev 3441)
@@ -203,3 +203,4 @@
 any/cvs-binutils_2.20.diff
 any/submitted-cross-zic.diff
 any/submitted-nss-nsswitch.diff
+any/submitted-install-map-files.diff


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to