OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 19-Oct-2003 21:00:47
Branch: HEAD Handle: 2003101920004303
Modified files:
openpkg-src/openpkg HISTORY lsync openpkg.spec rpmmacros rpmtool
openpkg-web news.txt
Log:
1. provide %{l_cppflags -i} for platform identification defines
2. use <prefix>/lib/openpkg/bash for rpmtool and lsync for better portability
Summary:
Revision Changes Path
1.73 +2 -0 openpkg-src/openpkg/HISTORY
1.5 +1 -1 openpkg-src/openpkg/lsync
1.232 +6 -2 openpkg-src/openpkg/openpkg.spec
1.45 +2 -2 openpkg-src/openpkg/rpmmacros
1.23 +17 -4 openpkg-src/openpkg/rpmtool
1.7075 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.72 -r1.73 HISTORY
--- openpkg-src/openpkg/HISTORY 15 Oct 2003 11:51:49 -0000 1.72
+++ openpkg-src/openpkg/HISTORY 19 Oct 2003 19:00:45 -0000 1.73
@@ -2,6 +2,8 @@
2003
====
+20031019 provide %{l_cppflags -i} for platform identification defines
+20031019 use <prefix>/lib/openpkg/bash for rpmtool and lsync for better portability
20031015 fix RPM for building without GCC again
20031014 port to Solaris 8 with Forte C compiler
20031014 fix filesystem space checking (aux.prereq.sh)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/lsync
============================================================================
$ cvs diff -u -r1.4 -r1.5 lsync
--- openpkg-src/openpkg/lsync 15 Jul 2003 10:08:26 -0000 1.4
+++ openpkg-src/openpkg/lsync 19 Oct 2003 19:00:45 -0000 1.5
@@ -1,4 +1,4 @@
-#!/bin/sh
[EMAIL PROTECTED]@/lib/openpkg/bash
##
## lsync -- Access Layer Synchronization Tool
## Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.231 -r1.232 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 15 Oct 2003 10:16:46 -0000 1.231
+++ openpkg-src/openpkg/openpkg.spec 19 Oct 2003 19:00:45 -0000 1.232
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20031015
+%define V_openpkg 20031019
# the used software versions
%define V_rpm 4.2.1
@@ -587,9 +587,13 @@
echo "acl_cv_rpath=no"
) >config.cache
+ # provide platform identification
+ os_name=`(uname -s) 2>/dev/null` || os_name='Unknown'
+ os_name=`echo "${os_name}" | tr 'abcdefghijklmnopqrstuvwxyz'
'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+
# set build tool flags
CC="${l_cc}"
- CPPFLAGS="-DOPENPKG -I$br/zlib-%{V_zlib} -I$br/bzip2-%{V_bzip2}
-I$br/beecrypt-%{V_beecrypt}"
+ CPPFLAGS="-DOPENPKG -DOPENPKG_${os_name} -I$br/zlib-%{V_zlib}
-I$br/bzip2-%{V_bzip2} -I$br/beecrypt-%{V_beecrypt}"
CFLAGS="$CPPFLAGS"
LDFLAGS="-L$br/zlib-%{V_zlib} -L$br/bzip2-%{V_bzip2}
-L$br/beecrypt-%{V_beecrypt}"
LIBS="$LDFLAGS -lz -lbz2 -lbeecrypt"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.44 -r1.45 rpmmacros
--- openpkg-src/openpkg/rpmmacros 14 Oct 2003 13:09:41 -0000 1.44
+++ openpkg-src/openpkg/rpmmacros 19 Oct 2003 19:00:46 -0000 1.45
@@ -242,8 +242,8 @@
%l_mflags(O) %(%{l_sane_env}; %{l_rpmtool} mflags %{-O:-O} %{l_make})
%l_cflags(O) %(%{l_sane_env}; %{l_rpmtool} cflags %{-O:-O} %{l_cc})
%l_cxxflags(O) %(%{l_sane_env}; %{l_rpmtool} cflags %{-O:-O} %{l_cxx})
-%l_cppflags() %(%{l_sane_env}; %{l_rpmtool} cppflags -p%{l_prefix} -- %*)
-%l_ldflags() %(%{l_sane_env}; %{l_rpmtool} ldflags -p%{l_prefix} -- %*)
+%l_cppflags(i) %(%{l_sane_env}; %{l_rpmtool} cppflags -p%{l_prefix}
%{-i:-i} -- %*)
+%l_ldflags() %(%{l_sane_env}; %{l_rpmtool} ldflags -p%{l_prefix}
-- %*)
# OSSP fake syslog library
%l_fsl_ldflags() %(if [ ".%{with_fsl}" = ".yes" ]; then
flags=`(%{l_prefix}/bin/fsl-config --all --ldflags) 2>/dev/null`; else flags=''; fi;
echo $flags)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool
============================================================================
$ cvs diff -u -r1.22 -r1.23 rpmtool
--- openpkg-src/openpkg/rpmtool 14 Oct 2003 13:09:41 -0000 1.22
+++ openpkg-src/openpkg/rpmtool 19 Oct 2003 19:00:46 -0000 1.23
@@ -1,4 +1,4 @@
-#!/bin/sh
[EMAIL PROTECTED]@/lib/openpkg/bash
##
## rpmtool -- RPM Auxiliary Tool
## Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
@@ -95,13 +95,13 @@
opt_O=no
;;
cppflags )
- str_usage="[<subdir> ...]"
+ str_usage="[-p <prefix>] [-i] [<subdir> ...]"
arg_spec="0+"
- opt_spec="p:"
+ opt_spec="p:i."
opt_p="/"
;;
ldflags )
- str_usage="[<subdir> ...]"
+ str_usage="[-p <prefix>] [<subdir> ...]"
arg_spec="0+"
opt_spec="p:"
opt_p="/"
@@ -457,6 +457,19 @@
done
if [ $std -eq 0 ]; then
cppflags="-I${opt_p}/include$cppflags"
+ fi
+ if [ ".$opt_i" = .yes ]; then
+ eval `sh /cw/lib/openpkg/platform -U -S ":" -C "" -F "%<ac>:%<st>" |\
+ sed -e 's/^\(.*\):\(.*\):\(.*\)$/arch="\1"; os_name="\2";
os_vers="\3";/'`
+ V=0; R=0; L=0
+ eval `echo "$os_vers" |\
+ sed -e 's/^/X/' \
+ -e
's/^X[^0-9]*\([0-9][0-9]*\)[^0-9][^0-9]*\([0-9][0-9]*\)[^0-9][^0-9]*\([0-9][0-9]*\).*$/V="\1";
R="\2"; L="\3";/' \
+ -e
's/^X[^0-9]*\([0-9][0-9]*\)[^0-9][^0-9]*\([0-9][0-9]*\).*$/V="\1"; R="\2";/' \
+ -e 's/^X[^0-9]*\([0-9][0-9]*\).*$/V="\1";/' \
+ -e 's/^X.*$/:/'`
+ os_vers=`echo . | awk '{ printf("%02d%02d%02d", V, R, L); }' V="$V"
R="$R" L="$L"`
+ cppflags="$cppflags -D__OPENPKG_${arch}
-D__OPENPKG_${os_name}=${os_vers}"
fi
echo "x$cppflags" | sed -e 's;^x;;' -e 's;^ *;;'
;;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7074 -r1.7075 news.txt
--- openpkg-web/news.txt 19 Oct 2003 12:41:54 -0000 1.7074
+++ openpkg-web/news.txt 19 Oct 2003 19:00:43 -0000 1.7075
@@ -1,3 +1,4 @@
+19-Oct-2003: Upgraded package: P<openpkg-20031019-20031019>
19-Oct-2003: New package: P<opera-7.21-20031019>
19-Oct-2003: Upgraded package: P<bar-1.03-20031019>
19-Oct-2003: Upgraded package: P<acroread-5.08-20031019>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
