OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Mar-2005 20:35:33
Branch: OPENPKG_2_3_SOLID Handle: 2005031319353300
Modified files: (Branch: OPENPKG_2_3_SOLID)
openpkg-src/emacs emacs.spec
Log:
MFC: fix building under with_leim=yes and building under Exec-shield
enabled Linux platforms
Summary:
Revision Changes Path
1.52.2.2 +8 -3 openpkg-src/emacs/emacs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.spec
============================================================================
$ cvs diff -u -r1.52.2.1 -r1.52.2.2 emacs.spec
--- openpkg-src/emacs/emacs.spec 21 Feb 2005 17:06:40 -0000 1.52.2.1
+++ openpkg-src/emacs/emacs.spec 13 Mar 2005 19:35:33 -0000 1.52.2.2
@@ -39,7 +39,7 @@
Group: Editor
License: GPL
Version: %{V_emacs}
-Release: 2.3.0
+Release: 2.3.1
# package options
%option with_x11 no
@@ -111,7 +111,7 @@
%prep
%setup -q -n emacs-%{V_subdir}
%if "%{with_leim}" == "yes"
- %setup -q -T -D -b 1
+ %setup -q -n emacs-%{V_subdir} -T -D -b 1
%endif
%patch -p0
@@ -170,7 +170,12 @@
--with-x-toolkit=no \
--without-x
%endif
- %{l_make} %{l_mflags -O}
+ cmd="%{l_make} %{l_mflags -O}"
+ if [ ".`uname -s`" = .Linux ] && %{l_shtool} path -s setarch; then
+ # work-around conflicting Exec-shield security feature
+ cmd="setarch i386 $cmd"
+ fi
+ eval $cmd
%install
rm -rf $RPM_BUILD_ROOT
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
