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: 06-Jun-2006 15:08:15
Branch: HEAD Handle: 2006060614081400
Modified files:
openpkg-src/js js.patch js.spec
Log:
port to Solaris 10/x86 and get rid of 'whoami' related warnings under
Solaris
Summary:
Revision Changes Path
1.5 +41 -0 openpkg-src/js/js.patch
1.11 +4 -2 openpkg-src/js/js.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/js/js.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 js.patch
--- openpkg-src/js/js.patch 6 Mar 2006 21:51:48 -0000 1.4
+++ openpkg-src/js/js.patch 6 Jun 2006 13:08:14 -0000 1.5
@@ -289,3 +289,44 @@
endif
all:
+Index: js/src/config/SunOS5.10_i86pc.mk
+--- js/src/config/SunOS5.10_i86pc.mk.orig 2006-06-06 14:24:18.124955215
+0200
++++ js/src/config/SunOS5.10_i86pc.mk 2006-06-06 14:24:07.034374207 +0200
+@@ -0,0 +1,16 @@
++
++CC = gcc
++LD = ld
++CCC = g++
++CFLAGS += -Wall -Wno-format
++MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS)
++RANLIB = echo
++CPU_ARCH = $(shell uname -m)
++GFX_ARCH = x
++OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -DSOLARIS -DHAVE_LOCALTIME_R
-DHAVE_VA_COPY -DVA_COPY=va_copy -DPIC -fPIC
++OS_LIBS = -lsocket -lnsl -ldl
++LDFLAGS =
++NOSUCHFILE = /solaris-rm-f-sucks
++JS_EDITLINE = 1
++OS_TEST = i86pc
++
+Index: js/src/config.mk
+--- js/src/config.mk.orig 2003-11-15 01:10:55.000000000 +0100
++++ js/src/config.mk 2006-06-06 14:32:09.769085477 +0200
+@@ -114,7 +114,7 @@
+
+ ifdef BUILD_OPT
+ OPTIMIZER = -O
+-DEFINES += -UDEBUG -DNDEBUG -UDEBUG_$(shell whoami)
++DEFINES += -UDEBUG -DNDEBUG
+ OBJDIR_TAG = _OPT
+ else
+ ifdef USE_MSVC
+@@ -122,7 +122,7 @@
+ else
+ OPTIMIZER = -g
+ endif
+-DEFINES += -DDEBUG -DDEBUG_$(shell whoami)
++DEFINES += -DDEBUG
+ OBJDIR_TAG = _DBG
+ endif
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/js/js.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 js.spec
--- openpkg-src/js/js.spec 6 Mar 2006 21:51:48 -0000 1.10
+++ openpkg-src/js/js.spec 6 Jun 2006 13:08:14 -0000 1.11
@@ -38,7 +38,7 @@
Group: Language
License: MPL/GPL/LGPL
Version: %{V_js}
-Release: 20060306
+Release: 20060606
# package options
%option with_perl no
@@ -101,7 +101,9 @@
( cd js/src
cp Makefile.ref Makefile
case "%{l_platform -t}" in
- *-freebsd* ) cp config/Linux_All.mk config/`uname -s``uname -r`.mk
;;
+ *-freebsd* ) cp config/Linux_All.mk config/`uname -s``uname
-r`.mk ;;
+ sun*-sunos5.1[01] ) cp config/SunOS5.9.mk config/`uname -s``uname
-r`.mk ;;
+ ix86*-sunos* ) rm -f lock_SunOS.s ;;
esac
touch config/`uname -s``uname -r`.mk
%{l_make} %{l_mflags} \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
