r4519 - glibc-package/branches/eglibc-2.13/debian/sysdeps
Author: aurel32
Date: 2011-02-11 18:47:56 +0000 (Fri, 11 Feb 2011)
New Revision: 4519
Modified:
glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-amd64.mk
glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-i386.mk
glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd.mk
Log:
Fix extra_config_options handling on kfreebsd
Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-amd64.mk 2011-02-11 18:31:54 UTC (rev 4518)
+++ glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-amd64.mk 2011-02-11 18:47:56 UTC (rev 4519)
@@ -1,3 +1,6 @@
+# Main library
+extra_config_options = --disable-compatible-utmp --disable-multi-arch
+
libc_slibdir = /lib
libc_libdir = /usr/lib
libc_rtlddir = /lib
@@ -18,7 +21,7 @@
i386_CXX = $(CXX) -m32
i386_add-ons = ports linuxthreads $(add-ons)
i386_extra_cflags = -march=pentium4 -mtune=generic
-i386_extra_config_options = $(extra_config_options) --disable-compatible-utmp
+i386_extra_config_options = $(extra_config_options)
i386_includedir = /usr/include/i486-kfreebsd-gnu
i386_rtlddir = /lib
i386_slibdir = /lib32
Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-i386.mk
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-i386.mk 2011-02-11 18:31:54 UTC (rev 4518)
+++ glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-i386.mk 2011-02-11 18:47:56 UTC (rev 4519)
@@ -1,3 +1,7 @@
+# Main library
+extra_config_options = --disable-compatible-utmp --disable-multi-arch
+
+# Build a 32-bit optimized library
EGLIBC_PASSES += i686
DEB_ARCH_REGULAR_PACKAGES += libc0.1-i686
@@ -8,4 +12,4 @@
i686_extra_cflags = -march=i686 -mtune=generic
i686_rtlddir = /lib
i686_slibdir = /lib/i686/cmov
-i686_extra_config_options = $(extra_config_options) --disable-profile --disable-compatible-utmp
+i686_extra_config_options = $(extra_config_options)
Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd.mk 2011-02-11 18:31:54 UTC (rev 4518)
+++ glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd.mk 2011-02-11 18:47:56 UTC (rev 4519)
@@ -5,7 +5,7 @@
# Linuxthreads Config
threads = yes
libc_add-ons = ports linuxthreads $(add-ons)
-libc_extra_config_options = $(extra_config_options) --disable-compatible-utmp --disable-multi-arch
+libc_extra_config_options = $(extra_config_options)
ifndef KFREEBSD_SOURCE
ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
Reply to: