r5419 - in glibc-package/branches/eglibc-2.16/debian: . sysdeps
Author: adconrad
Date: 2012-11-27 02:11:00 +0000 (Tue, 27 Nov 2012)
New Revision: 5419
Modified:
glibc-package/branches/eglibc-2.16/debian/changelog
glibc-package/branches/eglibc-2.16/debian/sysdeps/amd64.mk
glibc-package/branches/eglibc-2.16/debian/sysdeps/i386.mk
Log:
debian/sysdeps/{amd64,i386}.mk: Fix rtlddir for x32 alternate builds.
Modified: glibc-package/branches/eglibc-2.16/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/changelog 2012-11-26 09:21:06 UTC (rev 5418)
+++ glibc-package/branches/eglibc-2.16/debian/changelog 2012-11-27 02:11:00 UTC (rev 5419)
@@ -1,8 +1,8 @@
eglibc (2.16-0experimental2) UNRELEASED; urgency=low
- *
+ * debian/sysdeps/{amd64,i386}.mk: Fix rtlddir for x32 alternate builds.
- -- Adam Conrad <adconrad@ubuntu.com> Mon, 26 Nov 2012 02:20:40 -0700
+ -- Adam Conrad <adconrad@0c3.net> Mon, 26 Nov 2012 02:20:40 -0700
eglibc (2.16-0experimental1) experimental; urgency=low
Modified: glibc-package/branches/eglibc-2.16/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/sysdeps/amd64.mk 2012-11-26 09:21:06 UTC (rev 5418)
+++ glibc-package/branches/eglibc-2.16/debian/sysdeps/amd64.mk 2012-11-27 02:11:00 UTC (rev 5419)
@@ -46,6 +46,7 @@
x32_CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.7 -mx32
x32_CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.7 -mx32
x32_extra_config_options = $(extra_config_options) --disable-profile
+x32_rtlddir = /libx32
x32_slibdir = /libx32
x32_libdir = /usr/libx32
@@ -56,4 +57,3 @@
debian/libc6-dev-x32/usr/include/x86_64-linux-gnu/gnu/
endef
-
Modified: glibc-package/branches/eglibc-2.16/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/sysdeps/i386.mk 2012-11-26 09:21:06 UTC (rev 5418)
+++ glibc-package/branches/eglibc-2.16/debian/sysdeps/i386.mk 2012-11-27 02:11:00 UTC (rev 5419)
@@ -84,6 +84,7 @@
x32_CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.7 -mx32
x32_CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.7 -mx32
x32_extra_config_options = $(extra_config_options) --disable-profile
+x32_rtlddir = /libx32
x32_slibdir = /libx32
x32_libdir = /usr/libx32
Reply to: