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: 05-Apr-2004 16:11:07
Branch: OPENPKG_2_0_SOLID Handle: 2004040515110700
Modified files: (Branch: OPENPKG_2_0_SOLID)
openpkg-src/emacs emacs.patch emacs.spec
Log:
MFC: build-time fixes and convinience options
Summary:
Revision Changes Path
1.3.2.1 +11 -0 openpkg-src/emacs/emacs.patch
1.43.2.2 +22 -2 openpkg-src/emacs/emacs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.patch
============================================================================
$ cvs diff -u -r1.3 -r1.3.2.1 emacs.patch
--- openpkg-src/emacs/emacs.patch 31 Jul 2003 07:41:13 -0000 1.3
+++ openpkg-src/emacs/emacs.patch 5 Apr 2004 14:11:07 -0000 1.3.2.1
@@ -122,3 +122,14 @@
#endif
#define SYSV_SYSTEM_DIR
+--- src/s/sol2-4.h.orig 1998-08-28 19:38:20.000000000 -0400
++++ src/s/sol2-4.h 2004-02-27 16:21:42.615474000 -0500
+@@ -24,7 +24,7 @@
+ /* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX
+ has anything in it. It can be empty.
+ This works ok in temacs. */
+-#define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib \
++#define LD_SWITCH_SYSTEM_TEMACS -z nocombreloc -L/usr/ccs/lib \
+ `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` \
+ `NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'`
+ #endif /* GCC */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.spec
============================================================================
$ cvs diff -u -r1.43.2.1 -r1.43.2.2 emacs.spec
--- openpkg-src/emacs/emacs.spec 18 Feb 2004 14:48:56 -0000 1.43.2.1
+++ openpkg-src/emacs/emacs.spec 5 Apr 2004 14:11:07 -0000 1.43.2.2
@@ -34,15 +34,17 @@
Group: Editor
License: GPL
Version: 21.3
-Release: 2.0.0
+Release: 2.0.1
# package options
%option with_x11 no
%option with_jpeg no
%option with_png no
+%option with_tiff no
+%option with_gif no
# package option dependencies
-%if "%{with_jpeg}" == "yes" || "%{with_png}" == "yes"
+%if "%{with_jpeg}" == "yes" || "%{with_png}" == "yes" || "%{with_tiff}" == "yes" ||
"%{with_gif}" == "yes"
%undefine with_x11
%define with_x11 yes
%endif
@@ -67,6 +69,14 @@
BuildPreReq: png, zlib
PreReq: png, zlib
%endif
+%if "%{with_tiff}" == "yes"
+BuildPreReq: tiff
+PreReq: tiff
+%endif
+%if "%{with_gif}" == "yes"
+BuildPreReq: giflib
+PreReq: giflib
+%endif
%endif
AutoReq: no
AutoReqProv: no
@@ -93,7 +103,11 @@
configure
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+%if "%{with_tiff}" == "yes"
+ CPPFLAGS="%{l_cppflags tiff .}" \
+%else
CPPFLAGS="%{l_cppflags}" \
+%endif
LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
@@ -106,6 +120,12 @@
%endif
%if "%{with_png}" == "yes"
--with-png \
+%endif
+%if "%{with_tiff}" == "yes"
+ --with-tiff \
+%endif
+%if "%{with_gif}" == "yes"
+ --with-gif \
%endif
--with-x-toolkit=yes
%else
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
