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-Jun-2006 08:13:34
Branch: HEAD Handle: 2006061307133200
Modified files:
openpkg-src/xemacs xemacs.patch xemacs.spec
Log:
fix building under Solaris 10
Summary:
Revision Changes Path
1.3 +12 -0 openpkg-src/xemacs/xemacs.patch
1.42 +9 -5 openpkg-src/xemacs/xemacs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xemacs/xemacs.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 xemacs.patch
--- openpkg-src/xemacs/xemacs.patch 14 Jan 2006 12:55:41 -0000 1.2
+++ openpkg-src/xemacs/xemacs.patch 13 Jun 2006 06:13:32 -0000 1.3
@@ -10,3 +10,15 @@
#define IMAGE_INSTANCE_GTK_CURSOR(i) (GTK_IMAGE_INSTANCE_DATA (i)->cursor)
#define IMAGE_INSTANCE_GTK_COLORMAP(i) (GTK_IMAGE_INSTANCE_DATA
(i)->colormap)
#define IMAGE_INSTANCE_GTK_PIXELS(i) (GTK_IMAGE_INSTANCE_DATA (i)->pixels)
+Index: src/s/sol2.h
+--- src/s/sol2.h.orig 2003-09-18 06:36:54.000000000 +0200
++++ src/s/sol2.h 2006-06-13 08:02:32.908936073 +0200
+@@ -11,7 +11,7 @@
+ #endif
+
+ /* Fix understandable GCC lossage on Solaris 2.6 */
+-#if defined(__GNUC__) && OS_RELEASE >= 506 && !defined(NOT_C_CODE)
++#if defined(__GNUC__) && OS_RELEASE >= 506 && OS_RELEASE < 510 &&
!defined(NOT_C_CODE)
+
+ /* GCC va_list munging is a little messed up */
+ #define __GNUC_VA_LIST
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xemacs/xemacs.spec
============================================================================
$ cvs diff -u -r1.41 -r1.42 xemacs.spec
--- openpkg-src/xemacs/xemacs.spec 10 May 2006 20:01:45 -0000 1.41
+++ openpkg-src/xemacs/xemacs.spec 13 Jun 2006 06:13:32 -0000 1.42
@@ -37,7 +37,7 @@
Group: Editor
License: GPL
Version: %{V_xemacs}
-Release: 20060510
+Release: 20060613
# package options
%option with_gtk yes
@@ -94,10 +94,14 @@
[ ".$PACKAGE_PATH" != . ] && PACKAGE_PATH="${PACKAGE_PATH}::"
PACKAGE_PATH="${PACKAGE_PATH}%{l_prefix}/lib/xemacs/${i}-packages"
done
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags tiff glib}" \
- LDFLAGS="%{l_ldflags}" \
+ export CC="%{l_cc}"
+ export CFLAGS="%{l_cflags -O}"
+ export CPPFLAGS="%{l_cppflags tiff glib}"
+ export LDFLAGS="%{l_ldflags}"
+ export LIBS="-ldb"
+ case "%{l_platform -t}" in
+ *-sunos* ) LIBS="$LIBS -lrt" ;;
+ esac
./configure \
--prefix=%{l_prefix} \
%if "%{with_gtk}" == "yes"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
