[CVS] OpenPKG: openpkg-src/openpkg/ rpmmacros
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 Date: 24-Mar-2004 17:48:08
Branch: HEAD Handle: 2004032416480800
Modified files:
openpkg-src/openpkg rpmmacros
Log:
add set +x to shut up displaying the echos
Summary:
RevisionChanges Path
1.61+1 -1 openpkg-src/openpkg/rpmmacros
patch -p0 '@@ .'
Index: openpkg-src/openpkg/rpmmacros
$ cvs diff -u -r1.60 -r1.61 rpmmacros
--- openpkg-src/openpkg/rpmmacros 24 Mar 2004 16:25:43 - 1.60
+++ openpkg-src/openpkg/rpmmacros 24 Mar 2004 16:48:08 - 1.61
@@ -325,7 +325,7 @@
%integrity() %{l_check_nosource}
# macros for checking build environment
-%l_check_nosource() %(%{l_sane_env}; for url in . %{?_restricted}; do [
.$url = .. ] continue; eval `echo $url | sed -e
's!^\\(.*\\)::/\\([^/][^/]*\\)$!;url=1 -- \\; file=2\\!' -e
's!^\\([^:;][^:]*://.*/\\)\\([^/][^/]*\\)$!;url=1\\; file=2\\!' -e
's:^\\([^;].*\\)$:;url=(from unknown location) ; file=\\1:' -e 's:^;::'`; if [ !
-f %{_specdir}/$file ] [ ! -f %{_sourcedir}/$file ]; then ( echo Sorry, this
OpenPKG package contains a DISTRIBUTION RESTRICTED source file.; echo Before you can
proceed building this package you have to MANUALLY fetch; echo ${url}${file};
echo and provide it locally under the path; echo %{_sourcedir}/$file ) |
%{l_rpmtool} msg -b -t error | sed -e 's;^;echo ;' -e 's;$;;'; echo exit 1; fi;
done)
+%l_check_nosource() %(%{l_sane_env}; for url in . %{?_restricted}; do [
.$url = .. ] continue; eval `echo $url | sed -e
's!^\\(.*\\)::/\\([^/][^/]*\\)$!;url=1 -- \\; file=2\\!' -e
's!^\\([^:;][^:]*://.*/\\)\\([^/][^/]*\\)$!;url=1\\; file=2\\!' -e
's:^\\([^;].*\\)$:;url=(from unknown location) ; file=\\1:' -e 's:^;::'`; if [ !
-f %{_specdir}/$file ] [ ! -f %{_sourcedir}/$file ]; then echo set +x; ( echo
Sorry, this OpenPKG package contains a DISTRIBUTION RESTRICTED source file.; echo
Before you can proceed building this package you have to MANUALLY fetch; echo
${url}${file}; echo and provide it locally under the path; echo
%{_sourcedir}/$file ) | %{l_rpmtool} msg -b -t error | sed -e 's;^;echo ;' -e
's;$;;'; echo exit 1; fi; done)
%l_check_class() %(%{l_sane_env}; class=`echo %{?class} | sed -e
's;^$;JUNK;'`; %{l_rpmtool} check-class $class)
%prep %%prep\
%{l_check_nosource} \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openpkg/ rpmmacros
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 Date: 08-Jan-2003 15:31:38
Branch: HEAD Handle: 2003010814313800
Modified files:
openpkg-src/openpkg rpmmacros
Log:
ops, add missing slash
Summary:
RevisionChanges Path
1.29+1 -1 openpkg-src/openpkg/rpmmacros
patch -p0 '@@ .'
Index: openpkg-src/openpkg/rpmmacros
$ cvs diff -u -r1.28 -r1.29 rpmmacros
--- openpkg-src/openpkg/rpmmacros 8 Jan 2003 14:29:10 - 1.28
+++ openpkg-src/openpkg/rpmmacros 8 Jan 2003 14:31:38 - 1.29
@@ -202,7 +202,7 @@
# macros for NoSource/NoPatch (distribution restriction) integrity handling
%NoSource() %(if [ .%{?restriction} != .no ]; then echo NoSource:
%1; fi)%{expand:%%global _restricted %{?_restricted:%{_restricted}} %%{SOURCEURL%1}}
%NoPatch() %(if [ .%{?restriction} != .no ]; then echo NoPatch:
%1; fi)%{expand:%%global _restricted %{?_restricted:%{_restricted}} %%{PATCHURL%1}}
-%integrity() %(for url in . %{?_restricted}; do [ .$url = .. ]
continue; eval `echo $url | sed -e 's!^\\(.*\\)::\\([^/][^/]*\\)$!;url=1 --
\\; file=2\\!' -e 's!^\\([^:;][^:]*://.*/\\)\\([^/][^/]*\\)$!;url=1\\;
file=2\\!' -e 's:^\\([^;].*\\)$:;url=(from unknown location) ; file=\\1:' -e
's:^;::'`; if [ ! -f %{_specdir}/$file ] [ ! -f %{_sourcedir}/$file ]; then (
echo Sorry, this OpenPKG package contains a DISTRIBUTION RESTRICTED source file.;
echo Before you can proceed building this package you have to MANUALLY fetch; echo
${url}${file}; echo and provide it locally under the path; echo
%{_sourcedir}/$file ) | %{l_rpmtool} msg -b -t error 12; echo exit 1; fi; done)
+%integrity() %(for url in . %{?_restricted}; do [ .$url = .. ]
continue; eval `echo $url | sed -e 's!^\\(.*\\)::/\\([^/][^/]*\\)$!;url=1 --
\\; file=2\\!' -e 's!^\\([^:;][^:]*://.*/\\)\\([^/][^/]*\\)$!;url=1\\;
file=2\\!' -e 's:^\\([^;].*\\)$:;url=(from unknown location) ; file=\\1:' -e
's:^;::'`; if [ ! -f %{_specdir}/$file ] [ ! -f %{_sourcedir}/$file ]; then (
echo Sorry, this OpenPKG package contains a DISTRIBUTION RESTRICTED source file.;
echo Before you can proceed building this package you have to MANUALLY fetch; echo
${url}${file}; echo and provide it locally under the path; echo
%{_sourcedir}/$file ) | %{l_rpmtool} msg -b -t error 12; echo exit 1; fi; done)
# macro-processor add-on for testing external conditions
%l_test(pfd) %(if [ .%{?-p:yes} = .yes ]; then %{l_prefix}/bin/rpm -q
%1 /dev/null 21; rc=$?; elif [ .%{?-f:yes} = .yes ]; then test -f %1; rc=$?; elif
[ .%{?-d:yes} = .yes ]; then test -d %1; rc=$?; fi; if [ .$rc = .0 ]; then echo
yes; else echo no; fi)
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openpkg rpmmacros
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 Date: 22-Nov-2002 12:35:16
Branch: HEAD Handle: 2002112211351600
Modified files:
openpkg-src/openpkg rpmmacros
Log:
make macros more robust
Summary:
RevisionChanges Path
1.22+2 -2 openpkg-src/openpkg/rpmmacros
Index: openpkg-src/openpkg/rpmmacros
$ cvs diff -u -r1.21 -r1.22 rpmmacros
--- openpkg-src/openpkg/rpmmacros 22 Nov 2002 11:30:58 - 1.21
+++ openpkg-src/openpkg/rpmmacros 22 Nov 2002 11:35:16 - 1.22
@@ -161,8 +161,8 @@
# tool options
%l_mflags(O) %(%{l_sane_env}; %{l_rpmtool} flags -m %{-O:-O} %{l_make})
%l_cflags(O) %(%{l_sane_env}; %{l_rpmtool} flags -c %{-O:-O} %{l_cc})
-%l_cppflags()%(flags=-I%{l_prefix}/include; for pkg in %*; do
flags=$flags -I%{l_prefix}/include/$pkg; done; echo $flags)
-%l_ldflags() %(flags=-L%{l_prefix}/lib; for pkg in %*; do
flags=$flags -L%{l_prefix}/lib/$pkg; done; echo $flags)
+%l_cppflags()%(flags=-I%{l_prefix}/include; for pkg in . %*; do test
.$pkg = .. continue; flags=$flags -I%{l_prefix}/include/$pkg; done; echo $flags)
+%l_ldflags() %(flags=-L%{l_prefix}/lib; for pkg in . %*; do test
.$pkg = .. continue; flags=$flags -L%{l_prefix}/lib/$pkg; done; echo $flags)
# determine the current username
%l_whoami%((id -un) 2/dev/null || (whoami) 2/dev/null || (who am
i | cut -d -f1) 2/dev/null || echo $LOGNAME)
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openpkg rpmmacros
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 Date: 02-Oct-2002 12:16:12
Branch: HEAD Handle: 2002100211161200
Modified files:
openpkg-src/openpkg rpmmacros
Log:
add a useful l_test macro for dynamic dependencies (example follow in other commit
for perl-net and curl)
Summary:
RevisionChanges Path
1.20+3 -0 openpkg-src/openpkg/rpmmacros
Index: openpkg-src/openpkg/rpmmacros
$ cvs diff -u -r1.19 -r1.20 rpmmacros
--- openpkg-src/openpkg/rpmmacros 26 Aug 2002 09:20:36 - 1.19
+++ openpkg-src/openpkg/rpmmacros 2 Oct 2002 10:16:12 - 1.20
@@ -194,6 +194,9 @@
%ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
%ifndef()%if %{expand:%%{?%{1}:0}%%{!?%{1}:1}}
+# macro-processor add-on for testing external conditions
+%l_test(pfd) %(if [ .%{?-p:yes} = .yes ]; then %{l_prefix}/bin/rpm -q
%1 /dev/null 21; rc=$?; elif [ .%{?-f:yes} = .yes ]; then test -f %1; rc=$?; elif
[ .%{?-d:yes} = .yes ]; then test -d %1; rc=$?; fi; if [ .$rc = .0 ]; then echo
yes; else echo no; fi)
+
# helper macros for creating local copies of GNU config scripts
%update_config_scripts chmod u+w config.guess config.sub; cp
%{l_prefix}/lib/openpkg/config.guess .; cp %{l_prefix}/lib/openpkg/config.sub .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openpkg rpmmacros
OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Aug-2002 21:04:44
Branch: HEAD Handle: 2002080920044300
Modified files:
openpkg-src/openpkg rpmmacros
Log:
finally fix the sane-env problem for l_mflags and l_cflags
Summary:
RevisionChanges Path
1.17+8 -3 openpkg-src/openpkg/rpmmacros
Index: openpkg-src/openpkg/rpmmacros
$ cvs diff -u -r1.16 -r1.17 rpmmacros
--- openpkg-src/openpkg/rpmmacros 6 Aug 2002 15:16:38 - 1.16
+++ openpkg-src/openpkg/rpmmacros 9 Aug 2002 19:04:43 - 1.17
@@ -159,8 +159,8 @@
%l_xmkmf %{l_tool_locate xmkmf}
# tool options
-%l_mflags(O) %(%{l_rpmtool} flags -m %{-O:-O} %{l_make})
-%l_cflags(O) %(%{l_rpmtool} flags -c %{-O:-O} %{l_cc})
+%l_mflags(O) %(%{l_sane_env}; %{l_rpmtool} flags -m %{-O:-O} %{l_make})
+%l_cflags(O) %(%{l_sane_env}; %{l_rpmtool} flags -c %{-O:-O} %{l_cc})
%l_cppflags -I%{l_prefix}/include
%l_ldflags -L%{l_prefix}/lib
@@ -219,12 +219,17 @@
%l_fetch_backup_8-
%l_fetch_backup_9ftp://ftp.openpkg.org/sources/DST/%{name}/
-# sane build environment
+# sane build environment setup
%l_build_path%{l_prefix}/bin:@l_build_path@
%l_build_ldlp%{l_prefix}/lib:@l_build_ldlp@
%l_build_ulim@l_build_ulim@
%l_build_shell_cmd %{l_prefix}/lib/openpkg/bash
%l_build_shell_opt --norc --noprofile --posix
+
+# sane build environment for manual usage in macros (currently just $PATH)
+%l_sane_env PATH=%{l_build_path}; export PATH;
LD_LIBRARY_PATH=%{l_build_ldlp}; export LD_LIBRARY_PATH
+
+# sane build environment for %prep/%build/%install
%_buildshell env -i %{l_build_shell_cmd} %{l_build_shell_opt}
%___build_pre \
HOME=%{l_prefix}\
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
