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-Jun-2004 17:43:06
Branch: HEAD Handle: 2004060216430501
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmmacros
Log:
Evil hack to workaround build problems under Debian (at least 3.1)
(and derived platforms) where a Debian install-info(8) exists which is
both API and functionally incompatible to the de-facto standardized
install-info(8) command from GNU Texinfo.
ATTENTION: THIS SHOULD BE REPLACED ASAP WITH A MORE GENERIC BUILD
COMMAND OVERRIDE SOLUTION! This solution was just hacked in as a cruel
workaround in order to already get OpenPKG 2.1 running out-of-the-box
under Debian 3.1-PRE because it is the preferred bleeding-edge platform
of one of our beloved project stakeholders ;-) So, for god's sake...
Summary:
Revision Changes Path
1.185 +1 -0 openpkg-src/openpkg/HISTORY
1.337 +21 -0 openpkg-src/openpkg/openpkg.spec
1.64 +1 -1 openpkg-src/openpkg/rpmmacros
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.184 -r1.185 HISTORY
--- openpkg-src/openpkg/HISTORY 2 Jun 2004 08:52:59 -0000 1.184
+++ openpkg-src/openpkg/HISTORY 2 Jun 2004 15:43:05 -0000 1.185
@@ -2,6 +2,7 @@
2004
====
+20040602 add evil hack to workaround Debian 3.1 install-info(8) conflicts
20040602 remove unused code from run-command processor
20040602 prevent gcc 2.95 from optimizing RPM DB's sha1.c and run into a virtual
memory exhaustion situation
20040601 fixate path to GnuPG, because RPM 4.2 passes argument directly to execve(2)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.336 -r1.337 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 2 Jun 2004 08:28:22 -0000 1.336
+++ openpkg-src/openpkg/openpkg.spec 2 Jun 2004 15:43:05 -0000 1.337
@@ -1867,6 +1867,27 @@
) | %{l_prefix}/lib/openpkg/rpmtool msg -b -t warn
fi
+ # FIXME: Evil hack to workaround build problems under Debian
+ # (at least 3.1) (and similar platforms) where a Debian
+ # install-info(8) exists which is both API and functionally
+ # incompatible to the de-facto standardized install-info(8)
+ # command from GNU Texinfo. ATTENTION: THIS SHOULD BE REPLACED
+ # ASAP WITH A MORE GENERIC BUILD COMMAND OVERRIDE SOLUTION!
+ case "`cat %{l_prefix}/etc/openpkg/platform`" in
+ *-*-debian* )
+ if [ ! -d %{l_prefix}/lib/openpkg/override ]; then
+ mkdir %{l_prefix}/lib/openpkg/override >/dev/null 2>&1 || true
+ fi
+ if [ ! -f %{l_prefix}/lib/openpkg/override/install-info ]; then
+ ( echo "#!/bin/sh"
+ echo "echo 'OpenPKG: NOTICE: install-info(8) command execution
overridden'"
+ echo "exit 0"
+ ) >%{l_prefix}/lib/openpkg/override/install-info
+ chmod 775 %{l_prefix}/lib/openpkg/override/install-info
+ fi
+ ;;
+ esac
+
%preun
[ ".$1" != .0 ] && exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.63 -r1.64 rpmmacros
--- openpkg-src/openpkg/rpmmacros 1 Jun 2004 15:08:26 -0000 1.63
+++ openpkg-src/openpkg/rpmmacros 2 Jun 2004 15:43:06 -0000 1.64
@@ -358,7 +358,7 @@
%l_fetch_backup_9 ftp://ftp.openpkg.org/sources/DST/%{name}/
# sane build environment setup
-%l_build_path %{l_prefix}/bin:%{l_prefix}/sbin:@l_build_path@
+%l_build_path %(if [ -d %{l_prefix}/lib/openpkg/override ]; then echo
"%{l_prefix}/lib/openpkg/override:"; fi)%{l_prefix}/bin:%{l_prefix}/sbin:@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
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
