diff options
| author | David Brown | 2007-09-23 23:00:16 -0700 |
|---|---|---|
| committer | David Brown | 2007-09-23 23:00:16 -0700 |
| commit | 8251c5bd4c620639388087548dafc705ae2bcb70 (patch) | |
| tree | b8d6f81a3a5d1421ba285db2afd1904c59a44699 | |
| parent | c2318740e67cafb35ec324cd90b0bd635ed98dc2 (diff) | |
Revert "glibc: fix the issue of GLIBC_ARCH being unset in PRE_BUILD"
This reverts commit f088e2f8e1a4ecfb4ca14e60a6f588910d6f9223.
| -rw-r--r-- | libs/glibc/HISTORY | 7 | ||||
| -rwxr-xr-x | libs/glibc/PREPARE | 3 | ||||
| -rwxr-xr-x | libs/glibc/PRE_BUILD | 17 |
3 files changed, 8 insertions, 19 deletions
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY index 045a72d403..8ee352528e 100644 --- a/libs/glibc/HISTORY +++ b/libs/glibc/HISTORY @@ -1,10 +1,3 @@ -2007-09-16 Arwed v. Merkatz <v.merkatz@gmx.net> - * PREPARE: removed the persistent_add GLIBC_ARCH, there seems to be - problem with persistent vars set in DETAILS - * PRE_BUILD: derive GLIBC_HEADERS_DIR from SOURCE3 instead of using - GLIBC_ARCH, set GLIBC_HEADERS_DIR to something sane for non-nptl - builds - 2007-09-16 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * TESTS: added my info * DETAILS: don't return negative values diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE index aba6486cbb..ed07e7cf2b 100755 --- a/libs/glibc/PREPARE +++ b/libs/glibc/PREPARE @@ -10,4 +10,5 @@ fi && if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then config_query GLIBC_NOLIB64 "Shall the dynamic linker install to /lib (not /lib64) (lib64 purge part 2 of 2)?" n -fi +fi && +persistent_add GLIBC_ARCH diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD index e0baacf890..4a76e9c7e4 100755 --- a/libs/glibc/PRE_BUILD +++ b/libs/glibc/PRE_BUILD @@ -1,6 +1,12 @@ default_pre_build && # +# Set GLIBC_HEADERS_DIR for use later +# +persistent_add GLIBC_HEADERS_DIR && +GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/linux-headers-${HEADERS_VERSION}-${GLIBC_ARCH} && + +# # Set GLIBC_LIBIDN_DIR for use later # persistent_add GLIBC_LIBIDN_DIR && @@ -20,12 +26,6 @@ if [ "$GLIBC_NPTL" = "y" ]; then # # Unpack glibc-kernel-headers # - # - # Set GLIBC_HEADERS_DIR for use later - # - persistent_add GLIBC_HEADERS_DIR && - GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.bz2} && - unpack_file 3 && cd $GLIBC_HEADERS_DIR/usr/include && chmod -R +r * && @@ -39,11 +39,6 @@ else # # Unpack glibc-kernel-headers # - # - # Set GLIBC_HEADERS_DIR for use later - # - persistent_add GLIBC_HEADERS_DIR && - GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/kernel-headers && mkdir -p $GLIBC_HEADERS_DIR/usr/include && cd $GLIBC_HEADERS_DIR/usr/include && unpack_file 5 |