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: 09-Jul-2003 10:22:42
Branch: HEAD Handle: 2003070909224002
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmtool
openpkg-web news.txt
Log:
change syntax of append/prepend feature for %{l_cppflags} and
%{l_ldflags} macros; fix DB autoconf checks
Summary:
Revision Changes Path
1.7 +1 -0 openpkg-src/openpkg/HISTORY
1.169 +2 -1 openpkg-src/openpkg/openpkg.spec
1.19 +24 -24 openpkg-src/openpkg/rpmtool
1.5459 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.6 -r1.7 HISTORY
--- openpkg-src/openpkg/HISTORY 8 Jul 2003 12:19:09 -0000 1.6
+++ openpkg-src/openpkg/HISTORY 9 Jul 2003 08:22:42 -0000 1.7
@@ -2,6 +2,7 @@
2003
====
+20030709 change syntax of append/prepend feature for %{l_cppflags} and %{l_ldflags}
macros; fix DB autoconf checks
20030708 provide append/prepend feature for %{l_cppflags} and %{l_ldflags} macros
20030707 remove now officially deprecated usage of %{name} macro
20030606 correctly support "use_cxx" for setting the "c++" path
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.168 -r1.169 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 8 Jul 2003 14:41:21 -0000 1.168
+++ openpkg-src/openpkg/openpkg.spec 9 Jul 2003 08:22:42 -0000 1.169
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030708
+%define V_openpkg 20030709
# the used software versions
%define V_rpm 4.0.2
@@ -469,6 +469,7 @@
-e 's;/lib/rpm;/lib/openpkg;' \
-e "s;MKDIR_P=.*;MKDIR_P='%{l_prefix}/lib/openpkg/shtool mkdir -f -p -m
755';" \
-e 's;LDFLAGS_STATIC="[^"]*";LDFLAGS_STATIC="";g' \
+ -e 's;db-[0-9][0-9.]*;db;g' \
<configure >configure.n && \
mv configure.n configure
sed -e 's;@INTLLIBS@;@INTLLIBS@ @LIBMISC@;' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool
============================================================================
$ cvs diff -u -r1.18 -r1.19 rpmtool
--- openpkg-src/openpkg/rpmtool 8 Jul 2003 12:19:09 -0000 1.18
+++ openpkg-src/openpkg/rpmtool 9 Jul 2003 08:22:42 -0000 1.19
@@ -48,8 +48,8 @@
echo ' platform'
echo ' mflags [-O] <tool>'
echo ' cflags [-O] <tool>'
- echo ' cppflags [-p <prefix>] -- [[+-]<subdir> ...]'
- echo ' ldflags [-p <prefix>] -- [[+-]<subdir> ...]'
+ echo ' cppflags [-p <prefix>] [<subdir> ...]'
+ echo ' ldflags [-p <prefix>] [<subdir> ...]'
echo ' files [-v] [-o <outfile>] [-r <buildroot>] [<filelist>]'
echo ' user [-c] [-d] [-p <passwd>] [-n <realname>] [-d <homedir>]'
echo ' [-s <shell>] [-u <min-uid>] <username>'
@@ -442,39 +442,39 @@
;;
cppflags )
- cppflags="-I${opt_p}/include"
- for pkg in . $*; do
- [ ".$pkg" = .. ] && continue
- pos="+"
- eval `echo "x$pkg" |\
- sed -e 's/^x//' \
- -e 's/^\([^+-]\)/+\1/' \
- -e 's/^\([+-]\)\(.*\)$/pos="\1"; pkg="\2";/'`
- if [ ".$pos" = ".-" ]; then
- cppflags="-I${opt_p}/include/$pkg $cppflags"
+ std=0
+ cppflags=""
+ for pkg in .. $*; do
+ [ ".$pkg" = ... ] && continue
+ if [ ".$pkg" = .. ]; then
+ cppflags="$cppflags -I${opt_p}/include"
+ std=1
else
cppflags="$cppflags -I${opt_p}/include/$pkg"
fi
done
- echo "x$cppflags" | sed -e 's;^x;;'
+ if [ $std -eq 0 ]; then
+ cppflags="-I${opt_p}/include$cppflags"
+ fi
+ echo "x$cppflags" | sed -e 's;^x;;' -e 's;^ *;;'
;;
ldflags )
- ldflags="-L${opt_p}/lib"
- for pkg in . $*; do
- [ ".$pkg" = .. ] && continue
- pos="+"
- eval `echo "x$pkg" |\
- sed -e 's/^x//' \
- -e 's/^\([^+-]\)/+\1/' \
- -e 's/^\([+-]\)\(.*\)$/pos="\1"; pkg="\2";/'`
- if [ ".$pos" = ".-" ]; then
- ldflags="-L${opt_p}/lib/$pkg $ldflags"
+ std=0
+ ldflags=""
+ for pkg in .. $*; do
+ [ ".$pkg" = ... ] && continue
+ if [ ".$pkg" = .. ]; then
+ ldflags="$ldflags -L${opt_p}/lib"
+ std=1
else
ldflags="$ldflags -L${opt_p}/lib/$pkg"
fi
done
- echo "x$ldflags" | sed -e 's;^x;;'
+ if [ $std -eq 0 ]; then
+ ldflags="-L${opt_p}/lib$ldflags"
+ fi
+ echo "x$ldflags" | sed -e 's;^x;;' -e 's;^ *;;'
;;
files )
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5458 -r1.5459 news.txt
--- openpkg-web/news.txt 9 Jul 2003 07:24:20 -0000 1.5458
+++ openpkg-web/news.txt 9 Jul 2003 08:22:40 -0000 1.5459
@@ -1,3 +1,4 @@
+09-Jul-2003: Upgraded package: P<openpkg-20030709-20030709>
09-Jul-2003: Upgraded package: P<portfwd-0.26rc6-20030709>
09-Jul-2003: Upgraded package: P<dmalloc-5.2.1-20030709>
09-Jul-2003: Upgraded package: P<rt-3.0.3-20030709>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
