OpenPKG Specs: comparison openpkg/openpkg.spec

-:848f460f23dc
+:d07f9dc5b18a
 #   switch into a temporary build area
 cd openpkg-%{version}
 . ./.buildenv
-#   force usage of proper architecture parameter
-bitopt=
-case `sh $shtool platform -n -L -S "" -C "+" -F "%<ap>-%<sp>"` in
-amd64-*          ) bitopt=-m64 ;;
-ia64-*           ) bitopt=-m64 ;;
-sparc64-*        ) bitopt=-m64 ;;
-esac
 #   display verbosity header
 set +x; VERBOSE "BUILD: Build GNU bash (Bourne-again Shell)"; set -x
 #   build GNU bash tool
 ( cd bash-%{V_bash}
 ) >config.cache
 AUTOCONF="true"
 export AUTOCONF
 CC="${l_cc}"
 export CC
-CCFLAGS_FOR_BUILD="$bitopt -O" \
-export CCFLAGS_FOR_BUILD
 case "$plid" in
-Darwin/* ) LDFLAGS="$bitopt -Wl,-search_paths_first" ;;
+Darwin/* ) LDFLAGS="-Wl,-search_paths_first" ;;
 esac
 ./configure \
 --cache-file=./config.cache \
 --prefix=%{l_prefix} \
 --without-curses \
 #   display verbosity header
 set +x; VERBOSE "BUILD: Build GNU bzip2 (Compression Library)"; set -x
 #   build BZIP2 library
 ( cd bzip2-%{V_bzip2}
-${l_make} CC="${l_cc}" CFLAGS="$bitopt -O" libbz2.a bzip2 || exit $?
+${l_make} CC="${l_cc}" CFLAGS="-O" libbz2.a bzip2 || exit $?
 ( echo "# libbz2.la - a libtool library file"
 echo "# Generated by ltmain.sh - GNU libtool x.x.x"
 echo "dlname=''"
 echo "library_names=''"
 echo "old_library='libbz2.a'"
 #   display verbosity header
 set +x; VERBOSE "BUILD: Build Zlib (Compression Library)"; set -x
 #   build ZLIB library
 ( cd zlib-%{V_zlib}
-CC="${l_cc}" CFLAGS="$bitopt -O" ./configure
+CC="${l_cc}" CFLAGS="-O" ./configure
 ${l_make} CC="${l_cc}" libz.a || exit $? # intentionally do not pass CFLAGS here
 ) || exit $?
 #   display verbosity header
 set +x; VERBOSE "BUILD: Build XZ (Compression Library)"; set -x
 opts=""
 case "$plid" in
 Darwin/* ) opts="--disable-assembler" ;;
 esac
 CC="${l_cc}" \
-CFLAGS="$bitopt -O" \
+CFLAGS="-O" \
 ./configure \
 --prefix=%{l_prefix} \
 --libdir="%{l_prefix}/lib" \
 --mandir=%{l_prefix}/man \
 --without-libiconv-prefix \
 set +x; VERBOSE "BUILD: Build OSSP uuid (UUID Generation Tool)"; set -x
 #   build OSSP uuid tool
 ( cd uuid-%{V_uuid}
 CC="${l_cc}" \
-CFLAGS="$bitopt -O" \
+CFLAGS="-O" \
-LDFLAGS="$bitopt" \
 GREP="grep" \
 ./configure \
 --prefix=%{l_prefix} \
 --disable-shared
 ${l_make} || exit $?
 set +x; VERBOSE "BUILD: Build OpenSSL (Crypography and SSL/TLS Toolkit)"; set -x
 #   build OpenSSL toolkit
 ( cd openssl-%{V_openssl}
 sh $shtool subst \
+-e 's;-m64 *;;g' \
+-e 's;-xarch=amd64 *;;g' \
 -e 's;-m486;-march=i486;g' \
 -e 's;BN_LLONG *;;' \
 Configure
 sh $shtool subst \
 -e 's;test "$OSTYPE" = msdosdjgpp;true;' \
 util/point.sh
 sh $shtool subst \
 -e "1s;^.*\$;#!$l_perl;" \
 Configure `find . -name "*.pl" -print`
-sh $shtool subst \
--e 's;xarch=amd64;m64;g' \
-Configure
 opts=""
 case `sh $shtool platform -n -L -S "" -C "+" -F "%<ap>-%<sp>"` in
 *-solaris*       ) opts="-lnsl -lsocket" ;;
 esac
 case `sh $shtool platform -n -L -S "" -C "+" -F "%<ap>-%<sp>"` in
 ( cd libarchive-%{V_libarchive}
 sh $shtool subst \
 -e 's;\(AM_CFLAGS =\) -Wall;\1;' \
 Makefile.in
 CC="${l_cc}" \
-CFLAGS="$bitopt -O -D_POSIX_PTHREAD_SEMANTICS" \
+CFLAGS="-O -D_POSIX_PTHREAD_SEMANTICS" \
 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" \
-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}" \
+LDFLAGS="-L`pwd`/../zlib-%{V_zlib} -L`pwd`/../bzip2-%{V_bzip2} -L`pwd`/../xz-%{V_xz}/src/liblzma/.libs -L`pwd`/../openssl-%{V_openssl}" \
 GREP="grep" \
 ./configure \
 --prefix=%{l_prefix} \
 --libdir="%{l_prefix}/lib" \
 --enable-bsdtar \
 ) || exit $?
 #   build GNU diffutils
 ( cd diffutils-%{V_diffutils}
 CC="${l_cc}" \
-CFLAGS="$bitopt -O" \
+CFLAGS="-O" \
 ./configure \
 --prefix=%{l_prefix} \
 --disable-nls
 touch man/diff.1 man/diff3.1 && ${l_make} || exit $?
 ( mv src/diff src/diff3 src/sdiff src/cmp ..
 ( echo 'ac_cv_header_openssl_engine_h=no'
 echo 'lt_cv_prog_compiler_c_o_F77=no'
 echo 'lt_cv_sys_max_cmd_len=100'
 ) >config.cache
 CC="${l_cc}" \
-CFLAGS="$bitopt -I`pwd`/../zlib-%{V_zlib}" \
+CFLAGS="-I`pwd`/../zlib-%{V_zlib}" \
 CPPFLAGS="-I`pwd`/../zlib-%{V_zlib}" \
-LDFLAGS="$bitopt -L`pwd`/../zlib-%{V_zlib}" \
+LDFLAGS="-L`pwd`/../zlib-%{V_zlib}" \
 GREP="grep" \
 ./configure \
 --cache-file=./config.cache \
 --libdir="%{l_prefix}/lib" \
 --without-libidn \
 ) || exit $?
 #   build PCRE library
 ( cd pcre-%{V_pcre}
 CC="${l_cc}" \
-CFLAGS="$bitopt -O" \
+CFLAGS="-O" \
 GREP="grep" \
 ./configure \
 --disable-cpp \
 --disable-utf8 \
 --disable-shared
 echo 'ac_cv_have_dev_audio=no'
 echo 'ac_cv_func_gettimeofday=yes'
 echo 'bc_cv_as_noexecstack=no'
 ) >config.cache
 CC="${l_cc}" \
-CFLAGS="$bitopt -O" \
+CFLAGS="-O" \
 ./configure \
 --cache-file=./config.cache \
 --prefix=%{l_prefix} \
 --libdir="%{l_prefix}/lib" \
 --with-cpu=none \
 set +x; VERBOSE "BUILD: Build POPT (Option Parsing Library)"; set -x
 #   build POPT library
 ( cd popt-%{V_popt}
 CC="${l_cc}" \
-CFLAGS="$bitopt -O" \
+CFLAGS="-O" \
 CPPFLAGS="-DOPENPKG -DPOPT_fprintf=fprintf" \
 GREP="grep" \
 ./configure \
 --prefix=%{l_prefix} \
 --libdir="%{l_prefix}/lib" \
 set +x; VERBOSE "BUILD: Build SQLite (RDBMS Library)"; set -x
 #   build SQLite library
 ( cd sqlite-%{V_sqlite}
 CC="${l_cc}" \
-CFLAGS="$bitopt -O" \
+CFLAGS="-O" \
 LIBS="-lm" \
 GREP="grep" \
 ./configure \
 --prefix=%{l_prefix} \
 --libdir="%{l_prefix}/lib" \
 PERL="${l_perl}"
 export PERL
 #   set build tool flags
 CC="${l_cc}"
-CFLAGS="$bitopt"
+CFLAGS=""
 CPPFLAGS="-DRPM_VENDOR_OPENPKG"
-LDFLAGS="$bitopt"
+LDFLAGS=""
 LIBS=""
 LIBS="$LIBS -lm"
 export CC
 export CFLAGS
 export CPPFLAGS
 #   build "mutex" executable
 ${l_make} -f `SOURCE mutex.mk` \
 CC="${l_cc}" \
 CPPFLAGS="-Ipopt-%{V_popt}" \
-LDFLAGS="$bitopt -Lpopt-%{V_popt} -Lpopt-%{V_popt}/.libs" \
+LDFLAGS="-Lpopt-%{V_popt} -Lpopt-%{V_popt}/.libs" \
 MUTEX_DOT_C="`SOURCE mutex.c`"
 %install
 #   skip in bootstrap phase 2 (see openpkg.boot)
 [ ".$OPENPKG_BOOT" = .1 ] && exit 0

OpenPKG Specs / file comparison

comparison: openpkg/openpkg.spec

openpkg/openpkg.spec