diff options
| author | David Brown | 2007-10-30 04:07:39 +0000 |
|---|---|---|
| committer | David Brown | 2007-10-30 04:07:39 +0000 |
| commit | 6bf1b40c8981343bb684364867fba8255307890c (patch) | |
| tree | 3b04b7b70763be65d0ed9b2f7b7090a08003fadd | |
| parent | e045a3c40a38b03caa00d1524c903d21e397f56c (diff) | |
merged conflicting PRE_BUILD
| -rw-r--r-- | libs/glibc/HISTORY | 5 | ||||
| -rwxr-xr-x | libs/glibc/PRE_BUILD | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY index f941c42b55..cd815c50b4 100644 --- a/libs/glibc/HISTORY +++ b/libs/glibc/HISTORY @@ -1,3 +1,8 @@ +2007-09-23 David Brown <dmlb2000@gmail.com> + * PRE_BUILD: nisplus_fix.diff and iconv_open.patch removed not needed + * nisplus_fix.diff: removed + * iconv_open.patch: removed + 2007-09-16 David Brown <dmlb2000@gmail.com> * DETAILS: removed GLIBC_ARCH altogether * BUILD: removed GLIBC_ARCH gone... and some syntax errors as a result diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD index 8949c2303d..15a324034e 100755 --- a/libs/glibc/PRE_BUILD +++ b/libs/glibc/PRE_BUILD @@ -8,7 +8,6 @@ local GLIBC_LIBIDN_DIR=$SOURCE_DIRECTORY/glibc-libidn-$VERSION && if [ "$GLIBC_NPTL" = "y" ]; then cd $SOURCE_DIRECTORY && - if [ "$GLIBC_USEIDN" = "y" ]; then # # Unpack glibc-libidn |