1.1 --- a/openpkg/openpkg.spec Fri Aug 03 20:12:19 2012 +0200
1.2 +++ b/openpkg/openpkg.spec Sat Aug 04 14:16:14 2012 +0200
1.3 @@ -823,14 +823,6 @@
1.4 cd openpkg-%{version}
1.5 . ./.buildenv
1.6
1.7 - # force usage of proper architecture parameter
1.8 - bitopt=
1.9 - case `sh $shtool platform -n -L -S "" -C "+" -F "%<ap>-%<sp>"` in
1.10 - amd64-* ) bitopt=-m64 ;;
1.11 - ia64-* ) bitopt=-m64 ;;
1.12 - sparc64-* ) bitopt=-m64 ;;
1.13 - esac
1.14 -
1.15 # display verbosity header
1.16 set +x; VERBOSE "BUILD: Build GNU bash (Bourne-again Shell)"; set -x
1.17
1.18 @@ -856,10 +848,8 @@
1.19 export AUTOCONF
1.20 CC="${l_cc}"
1.21 export CC
1.22 - CCFLAGS_FOR_BUILD="$bitopt -O" \
1.23 - export CCFLAGS_FOR_BUILD
1.24 case "$plid" in
1.25 - Darwin/* ) LDFLAGS="$bitopt -Wl,-search_paths_first" ;;
1.26 + Darwin/* ) LDFLAGS="-Wl,-search_paths_first" ;;
1.27 esac
1.28 ./configure \
1.29 --cache-file=./config.cache \
1.30 @@ -876,7 +866,7 @@
1.31
1.32 # build BZIP2 library
1.33 ( cd bzip2-%{V_bzip2}
1.34 - ${l_make} CC="${l_cc}" CFLAGS="$bitopt -O" libbz2.a bzip2 || exit $?
1.35 + ${l_make} CC="${l_cc}" CFLAGS="-O" libbz2.a bzip2 || exit $?
1.36 ( echo "# libbz2.la - a libtool library file"
1.37 echo "# Generated by ltmain.sh - GNU libtool x.x.x"
1.38 echo "dlname=''"
1.39 @@ -899,7 +889,7 @@
1.40
1.41 # build ZLIB library
1.42 ( cd zlib-%{V_zlib}
1.43 - CC="${l_cc}" CFLAGS="$bitopt -O" ./configure
1.44 + CC="${l_cc}" CFLAGS="-O" ./configure
1.45 ${l_make} CC="${l_cc}" libz.a || exit $? # intentionally do not pass CFLAGS here
1.46 ) || exit $?
1.47
1.48 @@ -913,7 +903,7 @@
1.49 Darwin/* ) opts="--disable-assembler" ;;
1.50 esac
1.51 CC="${l_cc}" \
1.52 - CFLAGS="$bitopt -O" \
1.53 + CFLAGS="-O" \
1.54 ./configure \
1.55 --prefix=%{l_prefix} \
1.56 --libdir="%{l_prefix}/lib" \
1.57 @@ -932,8 +922,7 @@
1.58 # build OSSP uuid tool
1.59 ( cd uuid-%{V_uuid}
1.60 CC="${l_cc}" \
1.61 - CFLAGS="$bitopt -O" \
1.62 - LDFLAGS="$bitopt" \
1.63 + CFLAGS="-O" \
1.64 GREP="grep" \
1.65 ./configure \
1.66 --prefix=%{l_prefix} \
1.67 @@ -992,6 +981,8 @@
1.68 # build OpenSSL toolkit
1.69 ( cd openssl-%{V_openssl}
1.70 sh $shtool subst \
1.71 + -e 's;-m64 *;;g' \
1.72 + -e 's;-xarch=amd64 *;;g' \
1.73 -e 's;-m486;-march=i486;g' \
1.74 -e 's;BN_LLONG *;;' \
1.75 Configure
1.76 @@ -1001,9 +992,6 @@
1.77 sh $shtool subst \
1.78 -e "1s;^.*\$;#!$l_perl;" \
1.79 Configure `find . -name "*.pl" -print`
1.80 - sh $shtool subst \
1.81 - -e 's;xarch=amd64;m64;g' \
1.82 - Configure
1.83 opts=""
1.84 case `sh $shtool platform -n -L -S "" -C "+" -F "%<ap>-%<sp>"` in
1.85 *-solaris* ) opts="-lnsl -lsocket" ;;
1.86 @@ -1030,9 +1018,9 @@
1.87 -e 's;\(AM_CFLAGS =\) -Wall;\1;' \
1.88 Makefile.in
1.89 CC="${l_cc}" \
1.90 - CFLAGS="$bitopt -O -D_POSIX_PTHREAD_SEMANTICS" \
1.91 + CFLAGS="-O -D_POSIX_PTHREAD_SEMANTICS" \
1.92 CPPFLAGS="-I`pwd`/../zlib-%{V_zlib} -I`pwd`/../bzip2-%{V_bzip2} -I`pwd`/../xz-%{V_xz}/src/liblzma/api -I`pwd`/../openssl-%{V_openssl}/include" \
1.93 - LDFLAGS="$bitopt -L`pwd`/../zlib-%{V_zlib} -L`pwd`/../bzip2-%{V_bzip2} -L`pwd`/../xz-%{V_xz}/src/liblzma/.libs -L`pwd`/../openssl-%{V_openssl}" \
1.94 + LDFLAGS="-L`pwd`/../zlib-%{V_zlib} -L`pwd`/../bzip2-%{V_bzip2} -L`pwd`/../xz-%{V_xz}/src/liblzma/.libs -L`pwd`/../openssl-%{V_openssl}" \
1.95 GREP="grep" \
1.96 ./configure \
1.97 --prefix=%{l_prefix} \
1.98 @@ -1055,7 +1043,7 @@
1.99 # build GNU diffutils
1.100 ( cd diffutils-%{V_diffutils}
1.101 CC="${l_cc}" \
1.102 - CFLAGS="$bitopt -O" \
1.103 + CFLAGS="-O" \
1.104 ./configure \
1.105 --prefix=%{l_prefix} \
1.106 --disable-nls
1.107 @@ -1076,9 +1064,9 @@
1.108 echo 'lt_cv_sys_max_cmd_len=100'
1.109 ) >config.cache
1.110 CC="${l_cc}" \
1.111 - CFLAGS="$bitopt -I`pwd`/../zlib-%{V_zlib}" \
1.112 + CFLAGS="-I`pwd`/../zlib-%{V_zlib}" \
1.113 CPPFLAGS="-I`pwd`/../zlib-%{V_zlib}" \
1.114 - LDFLAGS="$bitopt -L`pwd`/../zlib-%{V_zlib}" \
1.115 + LDFLAGS="-L`pwd`/../zlib-%{V_zlib}" \
1.116 GREP="grep" \
1.117 ./configure \
1.118 --cache-file=./config.cache \
1.119 @@ -1098,7 +1086,7 @@
1.120 # build PCRE library
1.121 ( cd pcre-%{V_pcre}
1.122 CC="${l_cc}" \
1.123 - CFLAGS="$bitopt -O" \
1.124 + CFLAGS="-O" \
1.125 GREP="grep" \
1.126 ./configure \
1.127 --disable-cpp \
1.128 @@ -1128,7 +1116,7 @@
1.129 echo 'bc_cv_as_noexecstack=no'
1.130 ) >config.cache
1.131 CC="${l_cc}" \
1.132 - CFLAGS="$bitopt -O" \
1.133 + CFLAGS="-O" \
1.134 ./configure \
1.135 --cache-file=./config.cache \
1.136 --prefix=%{l_prefix} \
1.137 @@ -1153,7 +1141,7 @@
1.138 # build POPT library
1.139 ( cd popt-%{V_popt}
1.140 CC="${l_cc}" \
1.141 - CFLAGS="$bitopt -O" \
1.142 + CFLAGS="-O" \
1.143 CPPFLAGS="-DOPENPKG -DPOPT_fprintf=fprintf" \
1.144 GREP="grep" \
1.145 ./configure \
1.146 @@ -1173,7 +1161,7 @@
1.147 # build SQLite library
1.148 ( cd sqlite-%{V_sqlite}
1.149 CC="${l_cc}" \
1.150 - CFLAGS="$bitopt -O" \
1.151 + CFLAGS="-O" \
1.152 LIBS="-lm" \
1.153 GREP="grep" \
1.154 ./configure \
1.155 @@ -1229,9 +1217,9 @@
1.156
1.157 # set build tool flags
1.158 CC="${l_cc}"
1.159 - CFLAGS="$bitopt"
1.160 + CFLAGS=""
1.161 CPPFLAGS="-DRPM_VENDOR_OPENPKG"
1.162 - LDFLAGS="$bitopt"
1.163 + LDFLAGS=""
1.164 LIBS=""
1.165 LIBS="$LIBS -lm"
1.166 export CC
1.167 @@ -1348,7 +1336,7 @@
1.168 ${l_make} -f `SOURCE mutex.mk` \
1.169 CC="${l_cc}" \
1.170 CPPFLAGS="-Ipopt-%{V_popt}" \
1.171 - LDFLAGS="$bitopt -Lpopt-%{V_popt} -Lpopt-%{V_popt}/.libs" \
1.172 + LDFLAGS="-Lpopt-%{V_popt} -Lpopt-%{V_popt}/.libs" \
1.173 MUTEX_DOT_C="`SOURCE mutex.c`"
1.174
1.175 %install
