OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-May-2007 00:17:15
Branch: HEAD Handle: 2007050623170213
Modified files:
openpkg-src/bzip2 bzip2.spec
openpkg-src/db db.spec
openpkg-src/freetype freetype.spec
openpkg-src/gcc gcc.spec
openpkg-src/gd gd.spec
openpkg-src/imapd imapd.spec
openpkg-src/jpeg jpeg.spec
openpkg-src/ncurses ncurses.spec
openpkg-src/openpkg HISTORY openpkg.spec rpmtool
openpkg-src/png png.spec
openpkg-src/readline readline.spec
openpkg-src/sasl sasl.spec
openpkg-src/zlib zlib.spec
Log:
move over sparc64-freebsd fixes to a more general form within
rpmtool(8)
Summary:
Revision Changes Path
1.40 +2 -6 openpkg-src/bzip2/bzip2.spec
1.77 +1 -6 openpkg-src/db/db.spec
1.67 +1 -6 openpkg-src/freetype/freetype.spec
1.138 +2 -8 openpkg-src/gcc/gcc.spec
1.94 +2 -6 openpkg-src/gd/gd.spec
1.173 +1 -4 openpkg-src/imapd/imapd.spec
1.33 +2 -6 openpkg-src/jpeg/jpeg.spec
1.320 +2 -6 openpkg-src/ncurses/ncurses.spec
1.448 +1 -0 openpkg-src/openpkg/HISTORY
1.583 +1 -1 openpkg-src/openpkg/openpkg.spec
1.55 +9 -8 openpkg-src/openpkg/rpmtool
1.64 +2 -6 openpkg-src/png/png.spec
1.38 +2 -6 openpkg-src/readline/readline.spec
1.147 +2 -6 openpkg-src/sasl/sasl.spec
1.40 +2 -6 openpkg-src/zlib/zlib.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bzip2/bzip2.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 bzip2.spec
--- openpkg-src/bzip2/bzip2.spec 5 May 2007 17:17:43 -0000 1.39
+++ openpkg-src/bzip2/bzip2.spec 6 May 2007 22:17:06 -0000 1.40
@@ -33,7 +33,7 @@
Group: Compression
License: GPL
Version: 1.0.4
-Release: 20070505
+Release: 20070507
# list of sources
Source0: http://www.bzip.org/%{version}/bzip2-%{version}.tar.gz
@@ -74,13 +74,9 @@
%build
# build package
- cflags=""
- case "%{l_platform -t}" in
- sparc64-freebsd* ) cflags="-fPIC" ;;
- esac
%{l_make} %{l_mflags} \
CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O} -D_FILE_OFFSET_BITS=64 $cflags"
+ CFLAGS="%{l_cflags -O} -D_FILE_OFFSET_BITS=64"
%install
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/db/db.spec
============================================================================
$ cvs diff -u -r1.76 -r1.77 db.spec
--- openpkg-src/db/db.spec 5 May 2007 17:17:48 -0000 1.76
+++ openpkg-src/db/db.spec 6 May 2007 22:17:07 -0000 1.77
@@ -37,7 +37,7 @@
Group: Database
License: BSD
Version: %{V_version}.%{V_revision}
-Release: 20070505
+Release: 20070507
# package options
%option with_compat no
@@ -87,10 +87,6 @@
%build
# configure library
- cppflags=""
- case "%{l_platform -t}" in
- sparc64-freebsd* ) cppflags="-fPIC" ;;
- esac
mutex="no"
case "%{l_platform -p}" in
ix86-* ) mutex="x86/gcc-assembly" ;;
@@ -102,7 +98,6 @@
esac
cd build_unix
CC="%{l_cc}" \
- CPPFLAGS="%{l_cppflags} $cppflags" \
CFLAGS="%{l_cflags -O}" \
%if "%{with_cxx}" == "yes"
CXX="%{l_cxx}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/freetype/freetype.spec
============================================================================
$ cvs diff -u -r1.66 -r1.67 freetype.spec
--- openpkg-src/freetype/freetype.spec 5 May 2007 17:17:47 -0000
1.66
+++ openpkg-src/freetype/freetype.spec 6 May 2007 22:17:08 -0000
1.67
@@ -33,7 +33,7 @@
Group: Graphics
License: GPL
Version: 2.3.4
-Release: 20070505
+Release: 20070507
# list of sources
Source0:
http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.gz
@@ -74,12 +74,7 @@
builds/unix/configure
%build
- cppflags=""
- case "%{l_platform -t}" in
- sparc64-freebsd* ) cppflags="-fPIC" ;;
- esac
CC="%{l_cc}" \
- CPPFLAGS="%{l_cppflags} $cppflags" \
CFLAGS="%{l_cflags -O}" \
%{l_make} %{l_mflags} setup \
CFG="--prefix=%{l_prefix} --disable-shared --without-zlib"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.137 -r1.138 gcc.spec
--- openpkg-src/gcc/gcc.spec 5 May 2007 17:17:43 -0000 1.137
+++ openpkg-src/gcc/gcc.spec 6 May 2007 22:17:08 -0000 1.138
@@ -37,7 +37,7 @@
Group: Compiler
License: GPL
Version: %{V_full}
-Release: 20070505
+Release: 20070507
# package options
%option with_cxx yes
@@ -231,16 +231,10 @@
fi
%endif
- # enforce PIC on certain platforms
- boot_cflags=""
- case "%{l_platform -t}" in
- sparc64-freebsd* ) boot_cflags="-fPIC" ;;
- esac
-
# build the package
%{l_make} %{l_mflags} \
MAKE="%{l_make} %{l_mflags}" \
- BOOT_CFLAGS="${l_boot_cflags} $boot_cflags" \
+ BOOT_CFLAGS="${l_boot_cflags}" \
CFLAGS="${l_cflags}" \
LIBCFLAGS="${l_libcflags}" \
LIBCXXFLAGS="${l_libcxxflags}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gd/gd.spec
============================================================================
$ cvs diff -u -r1.93 -r1.94 gd.spec
--- openpkg-src/gd/gd.spec 5 May 2007 17:17:47 -0000 1.93
+++ openpkg-src/gd/gd.spec 6 May 2007 22:17:09 -0000 1.94
@@ -33,7 +33,7 @@
Group: Graphics
License: GPL
Version: 2.0.34
-Release: 20070505
+Release: 20070507
# package options
%option with_xpm no
@@ -95,13 +95,9 @@
( echo "ac_cv_header_iconv_h=no"
echo "am_cv_func_iconv=no"
) >config.cache
- cppflags=""
- case "%{l_platform -t}" in
- sparc64-freebsd* ) cppflags="-fPIC" ;;
- esac
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags . libpng} $cppflags" \
+ CPPFLAGS="%{l_cppflags . libpng}" \
LDFLAGS="%{l_ldflags}" \
%if "%{with_fontconfig}" == "yes"
LIBS="`pkg-config --libs fontconfig` -lm" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.172 -r1.173 imapd.spec
--- openpkg-src/imapd/imapd.spec 5 May 2007 17:17:52 -0000 1.172
+++ openpkg-src/imapd/imapd.spec 6 May 2007 22:17:10 -0000 1.173
@@ -33,7 +33,7 @@
Group: Mail
License: BSD
Version: 2.3.8
-Release: 20070505
+Release: 20070507
# package options
%option with_fsl yes
@@ -189,9 +189,6 @@
export CFLAGS="%{l_cflags -O}"
export LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}"
export LIBS="%{l_fsl_libs}"
- case "%{l_platform -t}" in
- sparc64-freebsd* ) CPPFLAGS="$CPPFLAGS -fPIC" ;;
- esac
%if "%{with_atvdom}" == "yes"
CPPFLAGS="$CPPFLAGS -DATVDOM"
%endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jpeg/jpeg.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 jpeg.spec
--- openpkg-src/jpeg/jpeg.spec 5 May 2007 17:17:46 -0000 1.32
+++ openpkg-src/jpeg/jpeg.spec 6 May 2007 22:17:11 -0000 1.33
@@ -33,7 +33,7 @@
Group: Graphics
License: GPL
Version: 6b
-Release: 20070505
+Release: 20070507
# list of sources
Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.gz
@@ -64,12 +64,8 @@
%patch -p0
%build
- cppflags=""
- case "%{l_platform -t}" in
- sparc64-freebsd* ) cppflags="-fPIC" ;;
- esac
CC="%{l_cc}" \
- CPPFLAGS="%{l_cppflags} $cppflags" \
+ CPPFLAGS="%{l_cppflags}" \
CFLAGS="%{l_cflags -O}" \
./configure \
--prefix=%{l_prefix} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ncurses/ncurses.spec
============================================================================
$ cvs diff -u -r1.319 -r1.320 ncurses.spec
--- openpkg-src/ncurses/ncurses.spec 6 May 2007 16:26:48 -0000 1.319
+++ openpkg-src/ncurses/ncurses.spec 6 May 2007 22:17:12 -0000 1.320
@@ -50,7 +50,7 @@
Group: Terminal
License: MIT-style
Version: %{V_base}.%{V_patchL}
-Release: 20070506
+Release: 20070507
# list of sources
Source0: ftp://invisible-island.net/ncurses/ncurses-%{V_base}.tar.gz
@@ -130,12 +130,8 @@
%patch -p0 -P 100
%build
- cppflags=""
- case "%{l_platform -t}" in
- sparc64-freebsd* ) cppflags="-fPIC" ;;
- esac
CC="%{l_cc}" \
- CPPFLAGS="%{l_cppflags} $cppflags" \
+ CPPFLAGS="%{l_cppflags}" \
CFLAGS="%{l_cflags}" \
./configure \
--prefix=%{l_prefix} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.447 -r1.448 HISTORY
--- openpkg-src/openpkg/HISTORY 19 Apr 2007 10:47:29 -0000 1.447
+++ openpkg-src/openpkg/HISTORY 6 May 2007 22:17:02 -0000 1.448
@@ -2,6 +2,7 @@
2007
====
+20070507 workaround PIC/DSO related problems under FreeBSD on sparc64 by
enforcing -fPIC
20070419 meticulously obey order when creating user, group, login shell
relationships
20070418 use bootstrapped bash to prevent problems when /bin/sh is not a
bourne shell
20070417 support %l_as macro and --use_as bootstrap option to complement ar,
ld, strip handling
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.582 -r1.583 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 19 Apr 2007 10:47:30 -0000 1.582
+++ openpkg-src/openpkg/openpkg.spec 6 May 2007 22:17:02 -0000 1.583
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20070419
+%define V_openpkg 20070507
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool
============================================================================
$ cvs diff -u -r1.54 -r1.55 rpmtool
--- openpkg-src/openpkg/rpmtool 5 Mar 2007 22:39:14 -0000 1.54
+++ openpkg-src/openpkg/rpmtool 6 May 2007 22:17:05 -0000 1.55
@@ -466,14 +466,15 @@
fi
fi
case "$platform" in
- amd64:FreeBSD:*:* | ia64:FreeBSD:*:* | x86_64:Linux:*:* )
- # at least under FreeBSD on amd64 and ia64 the GNU
- # binutils strictly require Position Independent
- # Code (PIC) when Dynamic Shared Objects (DSO) are
- # involved. As an ugly workaround we build everything
- # with PIC there, although this is more than required.
- # We also can assume that the C compiler is always
- # GCC, either the OpenPKG one or the FreeBSD one.
+ amd64:FreeBSD:*:* | ia64:FreeBSD:*:* | sparc64:FreeBSD:*:* |
x86_64:Linux:*:* )
+ # at least under FreeBSD on amd64, ia64 and sparc64
+ # the GNU binutils strictly require Position In-
+ # dependent Code (PIC) when Dynamic Shared Objects
+ # (DSO) are involved. As an ugly workaround we
+ # build everything with PIC there, although this is
+ # more than required. We also can assume that the C
+ # compiler is always GCC, either the OpenPKG one or
+ # the FreeBSD one.
cflags="-fPIC"
;;
esac
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/png/png.spec
============================================================================
$ cvs diff -u -r1.63 -r1.64 png.spec
--- openpkg-src/png/png.spec 5 May 2007 17:17:46 -0000 1.63
+++ openpkg-src/png/png.spec 6 May 2007 22:17:12 -0000 1.64
@@ -33,7 +33,7 @@
Group: Graphics
License: BSD
Version: 1.2.16
-Release: 20070505
+Release: 20070507
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/libpng/libpng-%{version}.tar.gz
@@ -70,13 +70,9 @@
%patch -p0
%build
- cppflags=""
- case "%{l_platform -t}" in
- sparc64-freebsd* ) cppflags="-fPIC" ;;
- esac
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags} $cppflags" \
+ CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
GREP="grep" \
./configure \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/readline/readline.spec
============================================================================
$ cvs diff -u -r1.37 -r1.38 readline.spec
--- openpkg-src/readline/readline.spec 5 May 2007 17:17:44 -0000
1.37
+++ openpkg-src/readline/readline.spec 6 May 2007 22:17:13 -0000
1.38
@@ -39,7 +39,7 @@
Group: Terminal
License: GPL
Version: %{V_base_real}.%{V_plvl_raw}
-Release: 20070505
+Release: 20070507
# list of sources
Source0: ftp://ftp.cwru.edu/pub/bash/readline-%{V_base_real}.tar.gz
@@ -78,12 +78,8 @@
%build
# configure package
- cppflags=""
- case "%{l_platform -t}" in
- sparc64-freebsd* ) cppflags="-fPIC" ;;
- esac
CC="%{l_cc}" \
- CPPFLAGS="%{l_cppflags} $cppflags" \
+ CPPFLAGS="%{l_cppflags}" \
CFLAGS="%{l_cflags -O}" \
./configure \
--prefix=%{l_prefix} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
============================================================================
$ cvs diff -u -r1.146 -r1.147 sasl.spec
--- openpkg-src/sasl/sasl.spec 5 May 2007 17:17:51 -0000 1.146
+++ openpkg-src/sasl/sasl.spec 6 May 2007 22:17:14 -0000 1.147
@@ -33,7 +33,7 @@
Group: Cryptography
License: BSD
Version: 2.1.22
-Release: 20070505
+Release: 20070507
# package options
%option with_fsl yes
@@ -150,10 +150,6 @@
lib/server.c
# determine build flags
- cppflags="%{l_cppflags}"
- case "%{l_platform -t}" in
- sparc64-freebsd* ) cppflags="$cppflags -fPIC" ;;
- esac
cflags="%{l_cflags -O} %{l_cppflags}"
ldflags="%{l_ldflags} %{l_fsl_ldflags}"
libs="-ldb %{l_fsl_libs}"
@@ -173,7 +169,7 @@
# configure package
CC="%{l_cc}" \
CFLAGS="$cflags" \
- CPPFLAGS="$cppflags" \
+ CPPFLAGS="%{l_cppflags}" \
LDFLAGS="$ldflags" \
LIBS="$libs" \
./configure \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/zlib/zlib.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 zlib.spec
--- openpkg-src/zlib/zlib.spec 5 May 2007 17:17:42 -0000 1.39
+++ openpkg-src/zlib/zlib.spec 6 May 2007 22:17:15 -0000 1.40
@@ -33,7 +33,7 @@
Group: Compression
License: BSD
Version: 1.2.3
-Release: 20070505
+Release: 20070507
# list of sources
Source0: http://www.zlib.net/zlib-%{version}.tar.gz
@@ -69,12 +69,8 @@
%setup -q
%build
- cflags=""
- case "%{l_platform -t}" in
- sparc64-freebsd* ) cflags="-fPIC" ;;
- esac
CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O} $cflags" \
+ CFLAGS="%{l_cflags -O}" \
./configure \
--prefix=%{l_prefix}
%{l_make} %{l_mflags -O}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
