OpenPKG Specs / changeset

     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

     2.1 --- a/openpkg/openssl.patch	Fri Aug 03 20:12:19 2012 +0200
     2.2 +++ b/openpkg/openssl.patch	Sat Aug 04 14:16:14 2012 +0200
     2.3 @@ -75,8 +75,15 @@
     2.4   	    *)
     2.5   		echo "i686-apple-darwin${VERSION}"
     2.6   		;;
     2.7 -@@ -413,7 +416,7 @@
     2.8 +@@ -411,9 +414,14 @@
     2.9 + # this is where the translation occurs into SSLeay terms
    2.10 + # ---------------------------------------------------------------------------
    2.11   
    2.12 ++# Assume CC is GNU GCC if 'dumpversion' argument produces valid output
    2.13 ++GCCVER=`sh -c "${CC-gcc} -dumpversion" 2>/dev/null`
    2.14 ++GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
    2.15 ++GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
    2.16 ++
    2.17   # Only set CC if not supplied already
    2.18   if [ -z "$CROSS_COMPILE$CC" ]; then
    2.19  -  GCCVER=`sh -c "gcc -dumpversion" 2>/dev/null`
    2.20 @@ -84,25 +91,25 @@
    2.21     if [ "$GCCVER" != "" ]; then
    2.22       # then strip off whatever prefix egcs prepends the number with...
    2.23       # Hopefully, this will work for any future prefixes as well.
    2.24 -@@ -424,8 +427,17 @@
    2.25 +@@ -424,8 +432,17 @@
    2.26       # peak single digit before and after first dot, e.g. 2.95.1 gives 29
    2.27       GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
    2.28       CC=gcc
    2.29  +    SUFFIX=gcc
    2.30 -+  else
    2.31 -+    CC=cc
    2.32 +   else
    2.33 +     CC=cc
    2.34  +    SUFFIX=cc
    2.35  +  fi
    2.36  +else
    2.37  +  if [ "$GCCVER" != "" ]; then
    2.38  +    SUFFIX=gcc
    2.39 -   else
    2.40 -     CC=cc
    2.41 ++  else
    2.42 ++    CC=cc
    2.43  +    SUFFIX=cc
    2.44     fi
    2.45   fi
    2.46   GCCVER=${GCCVER:-0}
    2.47 -@@ -435,7 +447,7 @@
    2.48 +@@ -435,7 +452,7 @@
    2.49     if [ $GCCVER -ge 30 ]; then
    2.50       # PA64 support only came in with gcc 3.0.x.
    2.51       # We check if the preprocessor symbol __LP64__ is defined...
    2.52 @@ -111,7 +118,7 @@
    2.53         : # __LP64__ has slipped through, it therefore is not defined
    2.54       else
    2.55         GCC_BITS="64"
    2.56 -@@ -446,13 +458,14 @@
    2.57 +@@ -446,13 +463,14 @@
    2.58     if [ $GCCVER -ge 30 ]; then
    2.59       # 64-bit ABI isn't officially supported in gcc 3.0, but it appears
    2.60       # to be working, at the very least 'make test' passes...
    2.61 @@ -127,7 +134,7 @@
    2.62     CCVER=`(cc -V 2>&1) 2>/dev/null | \
    2.63     	egrep -e '^cc: .* C [0-9]\.[0-9]' | \
    2.64   	sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
    2.65 -@@ -465,6 +478,7 @@
    2.66 +@@ -465,6 +483,7 @@
    2.67         sleep 5
    2.68       fi
    2.69     fi
    2.70 @@ -135,7 +142,7 @@
    2.71   fi
    2.72   
    2.73   if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
    2.74 -@@ -482,6 +496,7 @@
    2.75 +@@ -482,6 +501,7 @@
    2.76   
    2.77   if [ "${SYSTEM}" = "AIX" ]; then	# favor vendor cc over gcc
    2.78       (cc) 2>&1 | grep -iv "not found" > /dev/null && CC=cc
    2.79 @@ -143,7 +150,7 @@
    2.80   fi
    2.81   
    2.82   CCVER=${CCVER:-0}
    2.83 -@@ -507,7 +522,7 @@
    2.84 +@@ -507,7 +527,7 @@
    2.85   	if [ $CPU -ge 4000 ]; then
    2.86   		options="$options -mips2"
    2.87   	fi
    2.88 @@ -152,7 +159,7 @@
    2.89   	;;
    2.90     mips3-sgi-irix)
    2.91   	#CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
    2.92 -@@ -517,11 +532,11 @@
    2.93 +@@ -517,11 +537,11 @@
    2.94   	#else
    2.95   	#	options="$options -mips3"
    2.96   	#fi
    2.97 @@ -166,7 +173,7 @@
    2.98   	if [ "$TEST" = "false" -a -t 1 ]; then
    2.99   	  echo "         You have about 5 seconds to press Ctrl-C to abort."
   2.100   	  (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
   2.101 -@@ -533,7 +548,7 @@
   2.102 +@@ -533,7 +553,7 @@
   2.103           #else
   2.104           #        options="$options -mips3"
   2.105           #fi
   2.106 @@ -175,7 +182,7 @@
   2.107   	;;
   2.108     ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
   2.109     ppc-apple-darwin*)
   2.110 -@@ -566,6 +581,9 @@
   2.111 +@@ -566,6 +586,9 @@
   2.112   	else
   2.113   	    OUT="darwin-i386-cc"
   2.114   	fi ;;
   2.115 @@ -185,7 +192,7 @@
   2.116     armv6+7-*-iphoneos)
   2.117   	options="$options -arch%20armv6 -arch%20armv7"
   2.118   	OUT="iphoneos-cross" ;;
   2.119 -@@ -575,10 +593,10 @@
   2.120 +@@ -575,10 +598,10 @@
   2.121     alpha-*-linux2)
   2.122           ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
   2.123   	case ${ISA:-generic} in
   2.124 @@ -199,7 +206,7 @@
   2.125   	    case ${ISA:-generic} in
   2.126   	    EV5|EV45)		options="$options -mcpu=ev5";;
   2.127   	    EV56|PCA56)		options="$options -mcpu=ev56";;
   2.128 -@@ -662,7 +680,7 @@
   2.129 +@@ -662,7 +685,7 @@
   2.130   	;;
   2.131     x86_64-*-linux?) OUT="linux-x86_64" ;;
   2.132     *86-*-linux2) OUT="linux-elf"
   2.133 @@ -208,7 +215,7 @@
   2.134             if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
   2.135   	    options="$options -march=pentium"
   2.136             fi
   2.137 -@@ -676,17 +694,17 @@
   2.138 +@@ -676,17 +699,17 @@
   2.139     *-*-linux1) OUT="linux-aout" ;;
   2.140     *-*-linux2) OUT="linux-generic32" ;;
   2.141     sun4[uv]*-*-solaris2)
   2.142 @@ -229,7 +236,7 @@
   2.143   		# $GCC_ARCH denotes default ABI chosen by compiler driver
   2.144   		# (first one found on the $PATH). I assume that user
   2.145   		# expects certain consistency with the rest of his builds
   2.146 -@@ -712,21 +730,21 @@
   2.147 +@@ -712,21 +735,21 @@
   2.148   	    OUT="solaris64-sparcv9-$CC"
   2.149   	fi
   2.150   	;;
   2.151 @@ -257,7 +264,7 @@
   2.152   
   2.153     *86*-*-bsdi4)		OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;;
   2.154     alpha*-*-*bsd*)	OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;;
   2.155 -@@ -750,7 +768,7 @@
   2.156 +@@ -750,7 +773,7 @@
   2.157     *-*-osf)		OUT="osf1-alpha-cc" ;;
   2.158     *-*-tru64)		OUT="tru64-alpha-cc" ;;
   2.159     *-*-[Uu]nix[Ww]are7)
   2.160 @@ -266,7 +273,7 @@
   2.161   	  OUT="unixware-7-gcc" ; options="$options no-sse2"
   2.162   	else    
   2.163   	  OUT="unixware-7" ; options="$options no-sse2 -D__i386__"
   2.164 -@@ -761,12 +779,12 @@
   2.165 +@@ -761,12 +784,12 @@
   2.166     *-*-vos)
   2.167   	options="$options no-threads no-shared no-asm no-dso"
   2.168   	EXE=".pm"
   2.169 @@ -281,7 +288,7 @@
   2.170   	    OUT="hpux64-parisc2-gcc"
   2.171   	fi
   2.172   	[ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
   2.173 -@@ -781,8 +799,8 @@
   2.174 +@@ -781,8 +804,8 @@
   2.175   	        OUT="hpux-ia64-cc"
   2.176                fi
   2.177   	elif [ $CPU_VERSION -ge 532 ]; then	# PA-RISC 2.x CPU
   2.178 @@ -292,7 +299,7 @@
   2.179   		echo "WARNING! If you wish to build 64-bit library then you have to"
   2.180   		echo "         invoke './Configure hpux64-parisc2-cc' *manually*."
   2.181   		if [ "$TEST" = "false" -a -t 1 ]; then
   2.182 -@@ -791,9 +809,9 @@
   2.183 +@@ -791,9 +814,9 @@
   2.184   		fi
   2.185   	     fi
   2.186   	elif [ $CPU_VERSION -ge 528 ]; then	# PA-RISC 1.1+ CPU
   2.187 @@ -304,7 +311,7 @@
   2.188   	else					# Motorola(?) CPU
   2.189   	     OUT="hpux-$CC"
   2.190   	fi
   2.191 -@@ -803,7 +821,7 @@
   2.192 +@@ -803,7 +826,7 @@
   2.193   	[ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`
   2.194   	KERNEL_BITS=${KERNEL_BITS:-32}
   2.195   	OBJECT_MODE=${OBJECT_MODE:-32}
   2.196 @@ -313,7 +320,7 @@
   2.197   	    OUT="aix-gcc"
   2.198             if [ $OBJECT_MODE -eq 64 ]; then
   2.199               echo 'Your $OBJECT_MODE was found to be set to 64'
   2.200 -@@ -913,7 +931,7 @@
   2.201 +@@ -913,7 +936,7 @@
   2.202   #fi
   2.203   
   2.204   if [ -z "$OUT" ]; then
   2.205 @@ -322,7 +329,7 @@
   2.206   fi
   2.207   
   2.208   if [ ".$PERL" = . ] ; then
   2.209 -@@ -945,9 +963,9 @@
   2.210 +@@ -945,9 +968,9 @@
   2.211   # compiler for the platform ... in which case we add it on
   2.212   # the end ... otherwise we leave it off
   2.213   
   2.214 @@ -334,7 +341,7 @@
   2.215   fi
   2.216   
   2.217   OUT="$PREFIX$OUT"
   2.218 -@@ -957,9 +975,9 @@
   2.219 +@@ -957,9 +980,9 @@
   2.220     echo Configuring for $OUT
   2.221   
   2.222     if [ "$TEST" = "true" ]; then