diff options
| author | David Brown | 2007-09-23 23:04:34 -0700 |
|---|---|---|
| committer | David Brown | 2007-09-23 23:04:34 -0700 |
| commit | 5f64b4da1a9cf6e883043bd7f0698ff859f3d79c (patch) | |
| tree | d58db62572de820a27eac82ff2f1da64ba0526a6 | |
| parent | 4751793f52964c0301a7e4922e82dcbea5d93f40 (diff) | |
glibc merged
| -rw-r--r-- | libs/glibc/HISTORY | 3 | ||||
| -rwxr-xr-x | libs/glibc/PRE_BUILD | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY index 0b49faaa7d..58b6705c6c 100644 --- a/libs/glibc/HISTORY +++ b/libs/glibc/HISTORY @@ -1,3 +1,6 @@ +2007-05-05 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * PRE_BUILD: remove an useless persistent var (epilogue of #13465) + 2007-04-16 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * DETAILS: updated GLIBC_NPTL=y to 2.5 * glibc-2.4-iconv_open.patch, nisplus_fix.diff: deleted, added upstream diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD index 21c5945df6..d39e83ddf1 100755 --- a/libs/glibc/PRE_BUILD +++ b/libs/glibc/PRE_BUILD @@ -7,10 +7,10 @@ persistent_add GLIBC_HEADERS_DIR && GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/linux-libc-headers-$HEADERS_VERSION && # -# Set GLIBC_LIBIDN_DIR for use later +# Set GLIBC_LIBIDN_DIR for use later; the variable was needlessly persistent # -persistent_add GLIBC_LIBIDN_DIR && -GLIBC_LIBIDN_DIR=$SOURCE_DIRECTORY/glibc-libidn-$VERSION && +persistent_remove GLIBC_LIBIDN_DIR && +local GLIBC_LIBIDN_DIR=$SOURCE_DIRECTORY/glibc-libidn-$VERSION && if [ "$GLIBC_NPTL" = "y" ]; then cd $SOURCE_DIRECTORY && |