Browse Source

fix building under Solaris 10

Ralf S. Engelschall 19 years ago
parent
commit
88c51b92d8
2 changed files with 21 additions and 5 deletions
  1. 12 0
      xemacs/xemacs.patch
  2. 9 5
      xemacs/xemacs.spec

+ 12 - 0
xemacs/xemacs.patch

@@ -10,3 +10,15 @@ Index: src/glyphs-gtk.h
  #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

+ 9 - 5
xemacs/xemacs.spec

@@ -37,7 +37,7 @@ Class:        EVAL
 Group:        Editor
 License:      GPL
 Version:      %{V_xemacs}
-Release:      20060510
+Release:      20060613
 
 #   package options
 %option       with_gtk      yes
@@ -94,10 +94,14 @@ AutoReqProv:  no
         [ ".$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"