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:
Revision Changes 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 -0000 1.16
+++ openpkg-src/openpkg/rpmmacros 9 Aug 2002 19:04:43 -0000 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_9 ftp://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 Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
