tpcc/libpcc: use latest CVS build - mkports - recipes for building multiple softwares with mk(1)
(HTM) git clone git://z3bra.org/mkports
(DIR) Log
(DIR) Files
(DIR) Refs
---
(DIR) commit f4a643d347ec476b266bfb59cdac4ff375d04389
(DIR) parent 8dd26ffe1efa929e9bebf9756094e9d9ef18db84
(HTM) Author: z3bra <willyatmailoodotorg>
Date: Sat, 23 Jan 2016 18:38:27 +0100
pcc/libpcc: use latest CVS build
Diffstat:
M libpcc/mkfile | 6 ++++--
M pcc/mkfile | 11 ++++++++---
D pcc/patches/000-musl-configure.diff | 28 ----------------------------
A pcc/patches/000-usr_prefix.diff | 728 +++++++++++++++++++++++++++++++
D pcc/patches/001-deflibdir.diff | 30 ------------------------------
5 files changed, 740 insertions(+), 63 deletions(-)
---
(DIR) diff --git a/libpcc/mkfile b/libpcc/mkfile
t@@ -1,6 +1,8 @@
pkg = libpcc
-ver = 1.1.0
-url = ftp://pcc.ludd.ltu.se/pub/pcc-releases/pcc-libs-$ver.tgz
+ver = 20160123
+url = ftp://pcc.ludd.ltu.se/pub/pcc-libs/pcc-libs-$ver.tgz
+#ver = 1.1.0
+#url = ftp://pcc.ludd.ltu.se/pub/pcc-releases/pcc-libs-$ver.tgz
<../config.mk
<../default.mk
(DIR) diff --git a/pcc/mkfile b/pcc/mkfile
t@@ -1,8 +1,13 @@
pkg = pcc
-ver = 1.1.0
-url = ftp://pcc.ludd.ltu.se/pub/pcc-releases/$pkg-$ver.tgz
+ver = 20160123
+url = ftp://pcc.ludd.ltu.se/pub/pcc/$pkg-$ver.tgz
+#ver = 1.1.0
+#url = ftp://pcc.ludd.ltu.se/pub/pcc-releases/$pkg-$ver.tgz
<../config.mk
<../default.mk
-CONFIGURE = ${CONFIGURE} --libexecdir=/lib/pcc --with-libdir=/lib --with-incdir=/include
+CONFIGURE = ${CONFIGURE} \
+ --libexecdir=/lib/pcc \
+ --with-libdir=/lib \
+ --with-incdir=/include
(DIR) diff --git a/pcc/patches/000-musl-configure.diff b/pcc/patches/000-musl-configure.diff
t@@ -1,28 +0,0 @@
-diff -uN a/config.sub b/config.sub
---- a/config.sub 2015-06-18 18:55:00.839543215 +0200
-+++ b/config.sub 2015-06-18 18:59:43.464572172 +0200
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+ nto-qnx* | linux-gnu* | linux-musl | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
-@@ -1253,6 +1253,9 @@
- -linux-dietlibc)
- os=-linux-dietlibc
- ;;
-+ -linux-musl)
-+ os=-linux-musl
-+ ;;
- -linux*)
- os=`echo $os | sed -e 's|linux|linux-gnu|'`
- ;;
-Common subdirectories: a/csu and b/csu
-Common subdirectories: a/CVS and b/CVS
-Common subdirectories: a/libF77 and b/libF77
-Common subdirectories: a/libI77 and b/libI77
-Common subdirectories: a/libpcc and b/libpcc
-Common subdirectories: a/libsoftfloat and b/libsoftfloat
(DIR) diff --git a/pcc/patches/000-usr_prefix.diff b/pcc/patches/000-usr_prefix.diff
t@@ -0,0 +1,728 @@
+diff -urN a/cc/cc/cc.1 b/cc/cc/cc.1
+--- a/cc/cc/cc.1 2014-12-24 10:55:32.000000000 +0100
++++ b/cc/cc/cc.1 2016-01-23 18:22:14.552534159 +0100
+@@ -241,7 +241,7 @@
+ .It Fl nostartfiles
+ Do not link with the system startup files (crt0.c, etc.)
+ .It Fl nostdinc
+-Do not use the system include paths (/usr/include, etc.)
++Do not use the system include paths (/include, etc.)
+ .It Fl nostdlib
+ Do not link with the system default libraries or startup files.
+ .It Fl O Ns Oo Ar level Oc
+diff -urN a/cc/cc/cc.c b/cc/cc/cc.c
+--- a/cc/cc/cc.c 2015-12-29 10:27:06.000000000 +0100
++++ b/cc/cc/cc.c 2016-01-23 18:22:14.552534159 +0100
+@@ -190,7 +190,7 @@
+
+ /* preprocessor stuff */
+ #ifndef STDINC
+-#define STDINC "/usr/include/"
++#define STDINC "/include/"
+ #endif
+ #ifdef MULTIARCH_PATH
+ #define STDINC_MA STDINC MULTIARCH_PATH "/"
+@@ -205,7 +205,7 @@
+ #define PCCLIBDIR NULL
+ #endif
+ #ifndef LIBDIR
+-#define LIBDIR "/usr/lib/"
++#define LIBDIR "/lib/"
+ #endif
+ #ifndef DEFLIBDIRS /* default library search paths */
+ #ifdef MULTIARCH_PATH
+diff -urN a/cc/driver/platform.c b/cc/driver/platform.c
+--- a/cc/driver/platform.c 2012-08-09 13:41:28.000000000 +0200
++++ b/cc/driver/platform.c 2016-01-23 18:22:14.605867491 +0100
+@@ -204,11 +204,11 @@
+ };
+
+ static const char * const sysincdir_list_values0[] = {
+- "=/usr/include", NULL
++ "=/include", NULL
+ };
+ static const char * const sysincdir_list_values1[] = {
+ /* XXX fix up for libpcc? */
+- "=/usr/lib/gcc/x86_64-linux-gnu/4.4/include", NULL
++ "=/lib/gcc/x86_64-linux-gnu/4.4/include", NULL
+ };
+ static const struct platform_specific sysincdir_list[] = {
+ { ARCH_ANY, OS_ANY, sysincdir_list_values0 },
+@@ -216,13 +216,13 @@
+ };
+
+ static const char * const crtdir_list_values0[] = {
+- "=/usr/lib/i386", "=/usr/lib", NULL
++ "=/lib/i386", "=/lib", NULL
+ };
+ static const char * const crtdir_list_values1[] = {
+- "=/usr/lib", NULL
++ "=/lib", NULL
+ };
+ static const char * const crtdir_list_values2[] = {
+- "=/usr/lib64", "=/usr/lib/gcc/x86_64-linux-gnu/4.4", NULL
++ "=/lib", "=/lib/gcc/x86_64-linux-gnu/4.4", NULL
+ };
+ static const struct platform_specific crtdir_list[] = {
+ { ARCH_I386, OS_NETBSD, crtdir_list_values0 },
+@@ -231,7 +231,7 @@
+ };
+
+ static const char * const stdlib_list_values0[] = {
+- "-L/usr/lib/gcc/x86_64-linux-gnu/4.4", NULL
++ "-L/lib/gcc/x86_64-linux-gnu/4.4", NULL
+ };
+ static const char * const stdlib_list_values1[] = {
+ "-lgcc", "--as-needed", "-lgcc_s", "--no-as-needed",
+diff -urN a/config.guess b/config.guess
+--- a/config.guess 2014-12-17 12:20:48.000000000 +0100
++++ b/config.guess 2016-01-23 18:22:14.459200825 +0100
+@@ -169,7 +169,7 @@
+ # portion of the name. We always set it to "unknown".
+ sysctl="sysctl -n hw.machine_arch"
+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+- /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
++ /sbin/$sysctl 2>/dev/null || echo unknown)`
+ case "${UNAME_MACHINE_ARCH}" in
+ armeb) machine=armeb-unknown ;;
+ arm*) machine=arm-unknown ;;
+@@ -238,17 +238,17 @@
+ alpha:OSF1:*:*)
+ case $UNAME_RELEASE in
+ *4.0)
+- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
++ UNAME_RELEASE=`/sbin/sizer -v | awk '{print $3}'`
+ ;;
+ *5.*)
+- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++ UNAME_RELEASE=`/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
+- # According to Compaq, /usr/sbin/psrinfo has been available on
++ # According to Compaq, /sbin/psrinfo has been available on
+ # OSF/1 and Tru64 systems produced since 1995. I hope that
+ # covers most systems running today. This code pipes the CPU
+ # types through head -n 1, so we only detect the type of CPU 0.
+- ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
++ ALPHA_CPU_TYPE=`/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ case "$ALPHA_CPU_TYPE" in
+ "EV4 (21064)")
+ UNAME_MACHINE="alpha" ;;
+@@ -342,7 +342,7 @@
+ echo sparc-icl-nx6
+ exit ;;
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+- case `/usr/bin/uname -p` in
++ case `/bin/uname -p` in
+ sparc) echo sparc-icl-nx7; exit ;;
+ esac ;;
+ s390x:SunOS:*:*)
+@@ -380,7 +380,7 @@
+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:*:*)
+- case "`/usr/bin/arch -k`" in
++ case "`/bin/arch -k`" in
+ Series*|S4*)
+ UNAME_RELEASE=`uname -v`
+ ;;
+@@ -502,7 +502,7 @@
+ exit ;;
+ AViiON:dgux:*:*)
+ # DG/UX returns AViiON for all architectures
+- UNAME_PROCESSOR=`/usr/bin/uname -p`
++ UNAME_PROCESSOR=`/bin/uname -p`
+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+@@ -539,15 +539,15 @@
+ echo i386-ibm-aix
+ exit ;;
+ ia64:AIX:*:*)
+- if [ -x /usr/bin/oslevel ] ; then
+- IBM_REV=`/usr/bin/oslevel`
++ if [ -x /bin/oslevel ] ; then
++ IBM_REV=`/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ exit ;;
+ *:AIX:2:3)
+- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
++ if grep bos325 /include/stdio.h >/dev/null 2>&1; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <sys/systemcfg.h>
+@@ -566,21 +566,21 @@
+ else
+ echo rs6000-ibm-aix3.2.5
+ fi
+- elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
++ elif grep bos324 /include/stdio.h >/dev/null 2>&1; then
+ echo rs6000-ibm-aix3.2.4
+ else
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+ *:AIX:*:[4567])
+- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
++ IBM_CPU_ID=`/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
++ if /sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+ else
+ IBM_ARCH=powerpc
+ fi
+- if [ -x /usr/bin/lslpp ] ; then
+- IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
++ if [ -x /bin/lslpp ] ; then
++ IBM_REV=`/bin/lslpp -Lqc bos.rte.libc |
+ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+@@ -614,9 +614,9 @@
+ 9000/31? ) HP_ARCH=m68000 ;;
+ 9000/[34]?? ) HP_ARCH=m68k ;;
+ 9000/[678][0-9][0-9])
+- if [ -x /usr/bin/getconf ]; then
+- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++ if [ -x /bin/getconf ]; then
++ sc_cpu_version=`/bin/getconf SC_CPU_VERSION 2>/dev/null`
++ sc_kernel_bits=`/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+@@ -741,7 +741,7 @@
+ echo hppa1.0-hp-osf
+ exit ;;
+ i*86:OSF1:*:*)
+- if [ -x /usr/sbin/sysversion ] ; then
++ if [ -x /sbin/sysversion ] ; then
+ echo ${UNAME_MACHINE}-unknown-osf1mk
+ else
+ echo ${UNAME_MACHINE}-unknown-osf1
+@@ -810,7 +810,7 @@
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit ;;
+ *:FreeBSD:*:*)
+- UNAME_PROCESSOR=`/usr/bin/uname -p`
++ UNAME_PROCESSOR=`/bin/uname -p`
+ case ${UNAME_PROCESSOR} in
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+@@ -1062,7 +1062,7 @@
+ exit ;;
+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
++ if grep Novell /include/link.h >/dev/null 2>/dev/null; then
+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ else
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+@@ -1078,8 +1078,8 @@
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ exit ;;
+ i*86:*:3.2:*)
+- if test -f /usr/options/cb.name; then
+- UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
++ if test -f /options/cb.name; then
++ UNAME_REL=`sed -n 's/.*Version //p' </options/cb.name`
+ echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ elif /bin/uname -X 2>/dev/null >/dev/null ; then
+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+@@ -1111,7 +1111,7 @@
+ echo i860-intel-osf1
+ exit ;;
+ i860:*:4.*:*) # i860-SVR4
+- if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
++ if grep Stardent /include/sys/uadmin.h >/dev/null 2>&1 ; then
+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ else # Add other i860-SVR4 vendors below as they are discovered.
+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+@@ -1210,7 +1210,7 @@
+ echo mips-sony-newsos6
+ exit ;;
+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+- if [ -d /usr/nec ]; then
++ if [ -d /nec ]; then
+ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+ echo mips-unknown-sysv${UNAME_RELEASE}
+@@ -1395,15 +1395,15 @@
+ uname -s = `(uname -s) 2>/dev/null || echo unknown`
+ uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
++/bin/uname -p = `(/bin/uname -p) 2>/dev/null`
+ /bin/uname -X = `(/bin/uname -X) 2>/dev/null`
+
+ hostinfo = `(hostinfo) 2>/dev/null`
+ /bin/universe = `(/bin/universe) 2>/dev/null`
+-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
++/bin/arch -k = `(/bin/arch -k) 2>/dev/null`
+ /bin/arch = `(/bin/arch) 2>/dev/null`
+-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
+-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
++/bin/oslevel = `(/bin/oslevel) 2>/dev/null`
++/convex/getsysinfo = `(/convex/getsysinfo) 2>/dev/null`
+
+ UNAME_MACHINE = ${UNAME_MACHINE}
+ UNAME_RELEASE = ${UNAME_RELEASE}
+diff -urN a/configure b/configure
+--- a/configure 2015-12-31 17:05:19.000000000 +0100
++++ b/configure 2016-01-23 18:22:14.469200826 +0100
+@@ -36,7 +36,7 @@
+ as_nl='
+ '
+ export as_nl
+-# Printing a long string crashes Solaris 7 /usr/bin/printf.
++# Printing a long string crashes Solaris 7 /bin/printf.
+ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+@@ -50,9 +50,9 @@
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+ else
+- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+- as_echo_n='/usr/ucb/echo -n'
++ if test "X`(/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++ as_echo_body='eval /ucb/echo -n "$1$as_nl"'
++ as_echo_n='/ucb/echo -n'
+ else
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+@@ -209,7 +209,7 @@
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_found=false
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++for as_dir in /bin$PATH_SEPARATOR/bin$PATH_SEPARATOR$PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+@@ -568,7 +568,7 @@
+ #
+ # Initializations.
+ #
+-ac_default_prefix=/usr/local
++ac_default_prefix=/local
+ ac_clean_files=
+ ac_config_libobj_dir=.
+ LIBOBJS=
+@@ -771,7 +771,7 @@
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+ includedir='${prefix}/include'
+-oldincludedir='/usr/include'
++oldincludedir='/include'
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+ infodir='${datarootdir}/info'
+ htmldir='${docdir}'
+@@ -1314,7 +1314,7 @@
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+- --oldincludedir=DIR C header files for non-gcc [/usr/include]
++ --oldincludedir=DIR C header files for non-gcc [/include]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+@@ -1891,15 +1891,15 @@
+ uname -s = `(uname -s) 2>/dev/null || echo unknown`
+ uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
++/bin/uname -p = `(/bin/uname -p) 2>/dev/null || echo unknown`
+ /bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
+
+ /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
+-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
+-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
++/bin/arch -k = `(/bin/arch -k) 2>/dev/null || echo unknown`
++/convex/getsysinfo = `(/convex/getsysinfo) 2>/dev/null || echo unknown`
++/bin/hostinfo = `(/bin/hostinfo) 2>/dev/null || echo unknown`
+ /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
+-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
++/bin/oslevel = `(/bin/oslevel) 2>/dev/null || echo unknown`
+ /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
+
+ _ASUNAME
+@@ -3123,7 +3123,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
++ if test "$as_dir/$ac_word$ac_exec_ext" = "/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+@@ -3997,7 +3997,7 @@
+ ac_path_GREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++for as_dir in $PATH$PATH_SEPARATOR/xpg4/bin
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+@@ -4039,7 +4039,7 @@
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_GREP=$GREP
+@@ -4063,7 +4063,7 @@
+ ac_path_EGREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++for as_dir in $PATH$PATH_SEPARATOR/xpg4/bin
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+@@ -4105,7 +4105,7 @@
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_EGREP=$EGREP
+@@ -4557,14 +4557,14 @@
+ # Find a good install program. We prefer a C program (faster),
+ # so one script is as good as another. But avoid the broken or
+ # incompatible versions:
+-# SysV /etc/install, /usr/sbin/install
+-# SunOS /usr/etc/install
++# SysV /etc/install, /sbin/install
++# SunOS /etc/install
+ # IRIX /sbin/install
+ # AIX /bin/install
+ # AmigaOS /C/install, which installs bootblocks on floppy discs
+-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# AIX 4 /bin/installbsd, which doesn't work without a -g flag
++# AFS /afsws/bin/install, which mishandles nonexistent args
++# SVR4 /ucb/install, which tries to use the nonexistent group "staff"
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+ # Reject install programs that cannot install multiple files.
+@@ -4582,9 +4582,9 @@
+ # Account for people who put trailing slashes in PATH elements.
+ case $as_dir/ in #((
+ ./ | .// | /[cC]/* | \
+- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
++ /etc/* | /sbin/* | /etc/* | /sbin/* | /afsws/bin/* | \
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+- /usr/ucb/* ) ;;
++ /ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+@@ -5328,7 +5328,7 @@
+ as_nl='
+ '
+ export as_nl
+-# Printing a long string crashes Solaris 7 /usr/bin/printf.
++# Printing a long string crashes Solaris 7 /bin/printf.
+ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+@@ -5342,9 +5342,9 @@
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+ else
+- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+- as_echo_n='/usr/ucb/echo -n'
++ if test "X`(/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++ as_echo_body='eval /ucb/echo -n "$1$as_nl"'
++ as_echo_n='/ucb/echo -n'
+ else
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+diff -urN a/f77/f77/f77.1 b/f77/f77/f77.1
+--- a/f77/f77/f77.1 2008-12-24 18:40:41.000000000 +0100
++++ b/f77/f77/f77.1 2016-01-23 18:22:14.609200824 +0100
+@@ -144,16 +144,16 @@
+ `a.out'.
+ .SH FILES
+ .nf
+-.ta \w'/usr/lib/libF77.a 'u
++.ta \w'/lib/libF77.a 'u
+ file.[fresc] input file
+ file.o object file
+ a.out loaded output
+ ./fort[pid].? temporary
+-/usr/lib/f77pass1 compiler
++/lib/f77pass1 compiler
+ /lib/f1 pass 2
+ /lib/c2 optional optimizer
+-/usr/lib/libF77.a intrinsic function library
+-/usr/lib/libI77.a Fortran I/O library
++/lib/libF77.a intrinsic function library
++/lib/libI77.a Fortran I/O library
+ /lib/libc.a C library, see section 3
+ .fi
+ .SH "SEE ALSO"
+diff -urN a/f77/f77/f77.c b/f77/f77/f77.c
+--- a/f77/f77/f77.c 2011-08-04 10:32:32.000000000 +0200
++++ b/f77/f77/f77.c 2016-01-23 18:22:14.609200824 +0100
+@@ -573,7 +573,7 @@
+ argv[argc] = 0;
+
+ s = path;
+- t = "/usr/bin/";
++ t = "/bin/";
+ while(*t)
+ *s++ = *t++;
+ for(t = argv[1] ; (*s++ = *t++) ; )
+@@ -587,7 +587,7 @@
+
+ texec(path+9, argv); /* command */
+ texec(path+4, argv); /* /bin/command */
+- texec(path , argv); /* /usr/bin/command */
++ texec(path , argv); /* /bin/command */
+
+ fatal1("Cannot load %s",path+9);
+ }
+diff -urN a/os/android/ccconfig.h b/os/android/ccconfig.h
+--- a/os/android/ccconfig.h 2015-01-08 07:31:11.000000000 +0100
++++ b/os/android/ccconfig.h 2016-01-23 18:22:14.472534158 +0100
+@@ -43,7 +43,7 @@
+ #elif defined(mach_amd64)
+ #define CPPMDADD { "-D__x86_64__", "-D__x86_64", "-D__amd64__", \
+ "-D__amd64", "-D__LP64__", "-D_LP64", NULL, }
+-#define DEFLIBDIRS { "/usr/lib64/", 0 }
++#define DEFLIBDIRS { "/lib/", 0 }
+ #elif defined(mach_mips)
+ #define CPPMDADD { "-D__mips__", NULL, }
+ #elif defined(mach_arm)
+diff -urN a/os/bsd/ccconfig.h b/os/bsd/ccconfig.h
+--- a/os/bsd/ccconfig.h 2014-03-09 10:32:58.000000000 +0100
++++ b/os/bsd/ccconfig.h 2016-01-23 18:22:14.469200826 +0100
+@@ -39,7 +39,7 @@
+ #define CRTN 0
+
+ #ifdef LANG_F77
+-#define F77LIBLIST { "-L/usr/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
++#define F77LIBLIST { "-L/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
+ #endif
+
+ #if defined(mach_pdp11)
+diff -urN a/os/darwin/ccconfig.h b/os/darwin/ccconfig.h
+--- a/os/darwin/ccconfig.h 2014-06-04 08:43:50.000000000 +0200
++++ b/os/darwin/ccconfig.h 2016-01-23 18:22:14.472534158 +0100
+@@ -50,7 +50,7 @@
+ #endif
+
+ /*
+-ld -arch ppc -weak_reference_mismatches non-weak -o a.out -lcrt1.o -lcrt2.o -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1 hello_ppc.o -lgcc -lSystemStubs -lSystem
++ld -arch ppc -weak_reference_mismatches non-weak -o a.out -lcrt1.o -lcrt2.o -L/lib/gcc/powerpc-apple-darwin8/4.0.1 hello_ppc.o -lgcc -lSystemStubs -lSystem
+ */
+
+ #if defined(mach_i386)
+diff -urN a/os/dragonfly/ccconfig.h b/os/dragonfly/ccconfig.h
+--- a/os/dragonfly/ccconfig.h 2014-12-24 09:43:28.000000000 +0100
++++ b/os/dragonfly/ccconfig.h 2016-01-23 18:22:14.472534158 +0100
+@@ -37,20 +37,20 @@
+ #define CPPADD { "-D__DragonFly__", "-D__ELF__", NULL, }
+
+ #if __DragonFly_version < 200202
+-#define CRT0FILE "/usr/lib/gcc34/crt1.o"
+-#define CRT0FILE_PROFILE "/usr/lib/gcc34/gcrt1.o"
+-#define STARTFILES { "/usr/lib/gcc34/crti.o", "/usr/lib/gcc34/crtbegin.o", NULL }
+-#define LIBCLIBS { "-lc", "-L/usr/lib/gcc34", "-lgcc", NULL }
+-#define ENDFILES { "/usr/lib/gcc34/crtend.o", "/usr/lib/gcc34/crtn.o", NULL }
++#define CRT0FILE "/lib/gcc34/crt1.o"
++#define CRT0FILE_PROFILE "/lib/gcc34/gcrt1.o"
++#define STARTFILES { "/lib/gcc34/crti.o", "/lib/gcc34/crtbegin.o", NULL }
++#define LIBCLIBS { "-lc", "-L/lib/gcc34", "-lgcc", NULL }
++#define ENDFILES { "/lib/gcc34/crtend.o", "/lib/gcc34/crtn.o", NULL }
+ #else
+-#define CRT0FILE "/usr/lib/crt1.o"
+-#define CRT0FILE_PROFILE "/usr/lib/gcrt1.o"
+-#define STARTFILES { "/usr/lib/crti.o", "/usr/lib/gcc41/crtbegin.o", NULL }
+-#define LIBCLIBS { "-lc", "-L/usr/lib/gcc41", "-lgcc", NULL }
+-#define ENDFILES { "/usr/lib/gcc41/crtend.o", "/usr/lib/crtn.o", NULL }
++#define CRT0FILE "/lib/crt1.o"
++#define CRT0FILE_PROFILE "/lib/gcrt1.o"
++#define STARTFILES { "/lib/crti.o", "/lib/gcc41/crtbegin.o", NULL }
++#define LIBCLIBS { "-lc", "-L/lib/gcc41", "-lgcc", NULL }
++#define ENDFILES { "/lib/gcc41/crtend.o", "/lib/crtn.o", NULL }
+ #endif
+
+-#define DYNLINKLIB "/usr/libexec/ld-elf.so.2"
++#define DYNLINKLIB "/libexec/ld-elf.so.2"
+ #define STARTLABEL "_start"
+
+ #if defined(mach_i386)
+diff -urN a/os/linux/ccconfig.h b/os/linux/ccconfig.h
+--- a/os/linux/ccconfig.h 2014-12-24 09:43:28.000000000 +0100
++++ b/os/linux/ccconfig.h 2016-01-23 18:22:14.475867493 +0100
+@@ -50,9 +50,9 @@
+ #define DYNLINKLIB "/lib64/ld-linux-x86-64.so.2"
+ #define MUSL_DYLIB "/lib/ld-musl-x86_64.so.1"
+ #ifndef MULTIARCH_PATH
+-#define DEFLIBDIRS { "/usr/lib64/", 0 }
++#define DEFLIBDIRS { "/lib/", 0 }
+ #else
+-#define DEFLIBDIRS { "/usr/lib64/", "/usr/lib/" MULTIARCH_PATH "/", 0 }
++#define DEFLIBDIRS { "/lib/", "/lib/" MULTIARCH_PATH "/", 0 }
+ #endif
+ #elif defined(mach_mips)
+ #define CPPMDADD { "-D__mips__", NULL, }
+diff -urN a/os/litebsd/ccconfig.h b/os/litebsd/ccconfig.h
+--- a/os/litebsd/ccconfig.h 2016-01-06 17:14:54.000000000 +0100
++++ b/os/litebsd/ccconfig.h 2016-01-23 18:22:14.472534158 +0100
+@@ -35,7 +35,7 @@
+ #define DYNLINKER { NULL }
+
+ #ifdef LANG_F77
+-#define F77LIBLIST { "-L/usr/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
++#define F77LIBLIST { "-L/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
+ #endif
+
+ #define CPPMDADD { "-D__mips__", "-Dmips", "-D__mips=32", "-D__MIPSEL", \
+diff -urN a/os/minix/ccconfig.h b/os/minix/ccconfig.h
+--- a/os/minix/ccconfig.h 2014-12-24 09:43:28.000000000 +0100
++++ b/os/minix/ccconfig.h 2016-01-23 18:22:14.472534158 +0100
+@@ -77,7 +77,7 @@
+ #define STARTLABEL "crtso"
+ #define CRT0 "crtso.o"
+ #ifdef notyet
+-#define GCRT0 "/usr/lib/pcc/gcrtso.o"
++#define GCRT0 "/lib/pcc/gcrtso.o"
+ #endif
+
+ #define CRTBEGIN 0
+diff -urN a/os/mirbsd/ccconfig.h b/os/mirbsd/ccconfig.h
+--- a/os/mirbsd/ccconfig.h 2014-12-24 09:43:28.000000000 +0100
++++ b/os/mirbsd/ccconfig.h 2016-01-23 18:22:14.475867493 +0100
+@@ -35,7 +35,7 @@
+ }
+
+ /* for dynamically linked binaries */
+-#define DYNLINKLIB "/usr/libexec/ld.so"
++#define DYNLINKLIB "/libexec/ld.so"
+
+ #define CRTEND_T "crtend.o"
+ #define DEFLIBS { "-lc", NULL }
+diff -urN a/os/netbsd/ccconfig.h b/os/netbsd/ccconfig.h
+--- a/os/netbsd/ccconfig.h 2014-12-24 09:43:29.000000000 +0100
++++ b/os/netbsd/ccconfig.h 2016-01-23 18:22:14.472534158 +0100
+@@ -35,10 +35,10 @@
+ #define CPPADD { "-D__NetBSD__", "-D__ELF__", NULL, }
+
+ #ifdef LANG_F77
+-#define F77LIBLIST { "-L/usr/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
++#define F77LIBLIST { "-L/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
+ #endif
+
+-#define DYNLINKLIB "/usr/libexec/ld.elf_so"
++#define DYNLINKLIB "/libexec/ld.elf_so"
+
+ #define CRTEND_T "crtend.o"
+
+diff -urN a/os/nextstep/ccconfig.h b/os/nextstep/ccconfig.h
+--- a/os/nextstep/ccconfig.h 2014-12-24 09:43:29.000000000 +0100
++++ b/os/nextstep/ccconfig.h 2016-01-23 18:22:14.475867493 +0100
+@@ -57,7 +57,7 @@
+ #define STARTLABEL "start"
+
+ /*
+-ld -arch ppc -weak_reference_mismatches non-weak -o a.out -lcrt1.o -lcrt2.o -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1 hello_ppc.o -lgcc -lSystemStubs -lSystem
++ld -arch ppc -weak_reference_mismatches non-weak -o a.out -lcrt1.o -lcrt2.o -L/lib/gcc/powerpc-apple-darwin8/4.0.1 hello_ppc.o -lgcc -lSystemStubs -lSystem
+ */
+
+ #if defined(mach_i386)
+diff -urN a/os/openbsd/ccconfig.h b/os/openbsd/ccconfig.h
+--- a/os/openbsd/ccconfig.h 2014-12-24 09:43:29.000000000 +0100
++++ b/os/openbsd/ccconfig.h 2016-01-23 18:22:14.475867493 +0100
+@@ -31,12 +31,12 @@
+
+ /* common cpp predefines */
+ #define CPPADD { "-D__OpenBSD__", "-D__ELF__", NULL, }
+-#define DYNLINKLIB "/usr/libexec/ld.so"
++#define DYNLINKLIB "/libexec/ld.so"
+ #define CRTI 0 /* OpenBSD does not use this */
+ #define CRTN 0 /* OpenBSD does not use this */
+
+ #ifdef LANG_F77
+-#define F77LIBLIST { "-L/usr/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
++#define F77LIBLIST { "-L/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
+ #endif
+
+ #if defined(mach_amd64)
+diff -urN a/os/openbsd/f77config.h b/os/openbsd/f77config.h
+--- a/os/openbsd/f77config.h 2007-09-15 09:37:49.000000000 +0200
++++ b/os/openbsd/f77config.h 2016-01-23 18:22:14.475867493 +0100
+@@ -31,16 +31,16 @@
+ * Various settings that controls how the f77 compiler works.
+ */
+
+-#define PASS1NAME "/usr/lib/f77pass1"
++#define PASS1NAME "/lib/f77pass1"
+ #define PASS2NAME "/lib/f1"
+ #define PASS2OPT "/lib/c2"
+ #define NOFLPASS2 "/lib/fc1"
+
+-#define ASMNAME "/usr/bin/as"
+-#define LDNAME "/usr/bin/ld"
+-#define FOOTNAME "/usr/lib/crt0.o"
+-#define PROFFOOT "/usr/lib/mcrt0.o"
+-#define NOFLFOOT "/usr/lib/fcrt0.o"
+-#define NOFLPROFFOOT "/usr/lib/fmcrt0.o"
++#define ASMNAME "/bin/as"
++#define LDNAME "/bin/ld"
++#define FOOTNAME "/lib/crt0.o"
++#define PROFFOOT "/lib/mcrt0.o"
++#define NOFLFOOT "/lib/fcrt0.o"
++#define NOFLPROFFOOT "/lib/fmcrt0.o"
+ #define LIBLIST { "-lF77", "-lI77", "-lm", "-lc", "-l", NULL };
+
+diff -urN a/os/sunos/ccconfig.h b/os/sunos/ccconfig.h
+--- a/os/sunos/ccconfig.h 2014-12-24 09:43:29.000000000 +0100
++++ b/os/sunos/ccconfig.h 2016-01-23 18:22:14.472534158 +0100
+@@ -43,12 +43,12 @@
+ #define CRTEND 0
+
+ #ifdef LANG_F77
+-#define F77LIBLIST { "-L/usr/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
++#define F77LIBLIST { "-L/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
+ #endif
+
+ /* host-independent */
+ #define DYNLINKARG "-Bdynamic"
+-#define DYNLINKLIB "/usr/lib/ld.so"
++#define DYNLINKLIB "/lib/ld.so"
+
+ #if defined(mach_i386)
+ #define CPPMDADD { "-D__i386__", "-D__i386", NULL, }
+diff -urN a/os/sysv4/ccconfig.h b/os/sysv4/ccconfig.h
+--- a/os/sysv4/ccconfig.h 2014-12-24 09:43:29.000000000 +0100
++++ b/os/sysv4/ccconfig.h 2016-01-23 18:22:14.472534158 +0100
+@@ -40,11 +40,11 @@
+ #define GCRT0 "gcrt1.o"
+
+ #ifdef LANG_F77
+-#define F77LIBLIST { "-L/usr/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
++#define F77LIBLIST { "-L/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
+ #endif
+
+ #define DYNLINKARG "--dynamic-linker"
+-#define DYNLINKLIB "/usr/lib/ld.so.1"
++#define DYNLINKLIB "/lib/ld.so.1"
+
+ #if defined(mach_i386)
+ #define CPPMDADD { "-D__i386__", "-D__i386", NULL, }
(DIR) diff --git a/pcc/patches/001-deflibdir.diff b/pcc/patches/001-deflibdir.diff
t@@ -1,30 +0,0 @@
-diff -urN a/cc/cc/cc.c b/cc/cc/cc.c
---- a/cc/cc/cc.c 2015-08-16 16:00:18.867457413 +0200
-+++ b/cc/cc/cc.c 2015-08-16 16:03:28.963466133 +0200
-@@ -207,9 +207,9 @@
- #endif
- #ifndef DEFLIBDIRS /* default library search paths */
- #ifdef MULTIARCH_PATH
--#define DEFLIBDIRS { "/usr/lib/", 0 }
-+#define DEFLIBDIRS { LIBDIR, 0 }
- #else
--#define DEFLIBDIRS { "/usr/lib/", "/usr/lib/" MULTIARCH_PATH "/", 0 }
-+#define DEFLIBDIRS { LIBDIR, LIBDIR MULTIARCH_PATH "/", 0 }
- #endif
- #endif
- #ifndef DEFLIBS /* default libraries included */
-diff -urN a/os/linux/ccconfig.h b/os/linux/ccconfig.h
---- a/os/linux/ccconfig.h 2015-08-16 16:00:18.873457413 +0200
-+++ b/os/linux/ccconfig.h 2015-08-16 16:05:23.446471384 +0200
-@@ -48,9 +48,9 @@
- "-D__amd64", "-D__LP64__", "-D_LP64", NULL, }
- #define DYNLINKER { "-dynamic-linker", "/lib64/ld-linux-x86-64.so.2", NULL }
- #ifndef MULTIARCH_PATH
--#define DEFLIBDIRS { "/usr/lib64/", 0 }
-+#define DEFLIBDIRS { LIBDIR, 0 }
- #else
--#define DEFLIBDIRS { "/usr/lib64/", "/usr/lib/" MULTIARCH_PATH "/", 0 }
-+#define DEFLIBDIRS { LIBDIR, LIBDIR MULTIARCH_PATH "/", 0 }
- #endif
- #elif defined(mach_mips)
- #define CPPMDADD { "-D__mips__", NULL, }