diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:36 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:47 +0000 |
| commit | 36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2 (patch) | |
| tree | b3faaf573407b32aa645237a4d16b82778a39a92 /nixpkgs/pkgs/tools/package-management/checkinstall/glibc-check.patch | |
| parent | 4e31070265257dc67d120c27e0f75c2344fdfa9a (diff) | |
| parent | abf060725d7614bd3b9f96764262dfbc2f9c2199 (diff) | |
| download | nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.gz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.bz2 nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.lz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.xz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.zst nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.zip | |
Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199
Diffstat (limited to 'nixpkgs/pkgs/tools/package-management/checkinstall/glibc-check.patch')
| -rw-r--r-- | nixpkgs/pkgs/tools/package-management/checkinstall/glibc-check.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/tools/package-management/checkinstall/glibc-check.patch b/nixpkgs/pkgs/tools/package-management/checkinstall/glibc-check.patch new file mode 100644 index 000000000000..7f8cbccae8e5 --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/checkinstall/glibc-check.patch @@ -0,0 +1,71 @@ +diff -x '*~' -rc checkinstall-1.6.2pre20081116-orig/installwatch/create-localdecls checkinstall-1.6.2pre20081116/installwatch/create-localdecls +*** checkinstall-1.6.2pre20081116-orig/installwatch/create-localdecls 2008-11-16 17:18:58.000000000 +0100 +--- checkinstall-1.6.2pre20081116/installwatch/create-localdecls 2009-09-18 17:01:13.000000000 +0200 +*************** +*** 46,52 **** + echo -n 'Checking libc version... ' + gcc -Wall -o libctest libctest.c + VERSION=`ldd libctest | grep libc\\.so | awk '{print $1}'` +- rm libctest + echo $VERSION + echo "#define LIBC_VERSION \"$VERSION\"" >> $OUTFILE + if test "$VERSION" = 'libc.so.5' ; then +--- 46,51 ---- +*************** +*** 56,62 **** + + if test "$VERSION" = 'libc.so.6' ; then + echo -n 'Checking glibc subversion... ' +! tmp="`ldd /bin/sh | grep libc.so 2> /dev/null`" + LibcPath=`expr "$tmp" : '[^/]*\(/[^ ]*\)'` + tmp="`strings $LibcPath | grep -i 'c library'`" + OsLibcMajor=`expr "$tmp" : '.* \([0-9][0-9]*\)'` +--- 55,61 ---- + + if test "$VERSION" = 'libc.so.6' ; then + echo -n 'Checking glibc subversion... ' +! tmp="`ldd libctest | grep libc.so 2> /dev/null`" + LibcPath=`expr "$tmp" : '[^/]*\(/[^ ]*\)'` + tmp="`strings $LibcPath | grep -i 'c library'`" + OsLibcMajor=`expr "$tmp" : '.* \([0-9][0-9]*\)'` +*************** +*** 86,103 **** + 6) + echo '#define GLIBC_MINOR 6' >> $OUTFILE + SUBVERSION='glibc-2.6' ;; +! 7) + echo '#define GLIBC_MINOR 7' >> $OUTFILE + SUBVERSION='glibc-2.7' ;; + *) +- echo 'Treated as glibc >= 2.1 (finger crossed)' + echo '#define GLIBC_MINOR 1' >> $OUTFILE + SUBVERSION='glibc-2.1' ;; + esac + ;; + esac + fi + + echo >> $OUTFILE + echo '#endif' >> $OUTFILE + +--- 85,104 ---- + 6) + echo '#define GLIBC_MINOR 6' >> $OUTFILE + SUBVERSION='glibc-2.6' ;; +! 7|8|9|10|11|12|13|14|15|16|17|18) + echo '#define GLIBC_MINOR 7' >> $OUTFILE + SUBVERSION='glibc-2.7' ;; + *) + echo '#define GLIBC_MINOR 1' >> $OUTFILE + SUBVERSION='glibc-2.1' ;; + esac + ;; + esac ++ echo $SUBVERSION + fi + ++ rm libctest ++ + echo >> $OUTFILE + echo '#endif' >> $OUTFILE + |