Date: Wed, 4 Jan 2006 09:28:10 -0200 From: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> To: freebsd-eclipse@freebsd.org Subject: Patch java/swt31 Message-ID: <20060104112833.79463.qmail@exxodus.fedaykin.here>
next in thread | raw e-mail | index | archive | help
--2B/JsCI69OhZNC5r
Content-Type: multipart/mixed; boundary="AhhlLboLdkugWU4S"
Content-Disposition: inline
--AhhlLboLdkugWU4S
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Hi,
I've just seen the new port java/swt31. While building it,
I noticed that the port does not respect C{C,XX,FLAGS}. Is that by
design?
If it was not a design decision; perhaps, you could check
the attached patch to see if it is appropriate.
I hope it is helpful. Thanks for this port. Now I can
patch both net/azureus and net/mldonkey-sancho reducing both
dependency lists. :)
Regards,
--=20
Mario S F Ferreira - DF - Brazil - "I guess this is a signature."
feature, n: a documented bug | bug, n: an undocumented feature
--AhhlLboLdkugWU4S
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch
Content-Transfer-Encoding: quoted-printable
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/x11-toolkits/swt31/Makefile,v
retrieving revision 1.1
diff -d -u -u -d -r1.1 Makefile
--- Makefile 4 Jan 2006 09:39:36 -0000 1.1
+++ Makefile 4 Jan 2006 11:23:32 -0000
@@ -31,6 +31,7 @@
lib/libswt-pi-gtk-%%BUILD%%.so
=20
USE_JAVA=3D yes
+USE_REINPLACE=3D yes
JAVA_VERSION=3D 1.4+
JAVA_OS=3D native
=20
@@ -98,13 +99,17 @@
+ "cairo_structs.c" \
+ "cairo_structs.h"
.endif
+ @${REINPLACE_CMD} -E \
+ -e 's|%%CC%%|${CC}|' \
+ -e 's|%%CXX%%|${CXX}|' \
+ ${WRKSRC}/build.sh
=20
do-build:
@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} build.sh)
=20
do-install:
${MKDIR} ${JAVAJARDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/libswt-*.so ${PREFIX}/lib
+ ${INSTALL_DATA} ${WRKSRC}/libswt-*.so ${PREFIX}/lib
${INSTALL_DATA} ${WRKSRC}/swt.jar ${JAVAJARDIR}/
=20
.include <bsd.port.post.mk>
Index: files/patch-build.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/x11-toolkits/swt31/files/patch-build.sh,v
retrieving revision 1.1
diff -d -u -u -d -r1.1 patch-build.sh
--- files/patch-build.sh 4 Jan 2006 09:39:36 -0000 1.1
+++ files/patch-build.sh 4 Jan 2006 11:23:32 -0000
@@ -1,12 +1,13 @@
---- build.sh.orig Fri May 13 11:37:09 2005
-+++ build.sh Sat May 14 21:02:00 2005
-@@ -100,6 +100,33 @@
+--- build.sh.orig Wed May 4 19:44:42 2005
++++ build.sh Wed Jan 4 08:43:08 2006
+@@ -100,6 +100,34 @@
;;=09
esac
;;
+ "FreeBSD")
-+ CC=3Dgcc
-+ LD=3Dgcc
++ CC=3D%%CC%%
++ CXX=3D%%CXX%%
++ LD=3D%%CC%%
+ XTEST_LIB_PATH=3D$X11BASE/lib
+ GECKO_I=3D${X11BASE}/include/${BROWSER}
+ GECKO_INCLUDES=3D"-I${GECKO_I} -I${LOCALBASE}/include/nspr -I${GECKO_I}=
/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring"
@@ -34,9 +35,12 @@
"SunOS")
CC=3Dgcc
LD=3Dgcc
-@@ -128,4 +155,4 @@
+@@ -126,6 +154,6 @@
+ ;;
+ esac
=20
- export CC LD JAVA_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_INCLUD=
ES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME OUTPUT_DIR
+-export CC LD JAVA_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_INCLUD=
ES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME OUTPUT_DIR
++export CC CXX LD JAVA_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_IN=
CLUDES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME OUTPUT_DIR
=20
-make -f $makefile ${1} ${2} ${3} ${4}
+gmake -f $makefile ${1} ${2} ${3} ${4}
Index: files/patch-make_freebsd.mak
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/x11-toolkits/swt31/files/patch-make_freebsd.mak,v
retrieving revision 1.1
diff -d -u -u -d -r1.1 patch-make_freebsd.mak
--- files/patch-make_freebsd.mak 4 Jan 2006 09:39:36 -0000 1.1
+++ files/patch-make_freebsd.mak 4 Jan 2006 11:23:32 -0000
@@ -1,5 +1,5 @@
---- make_freebsd.mak.orig Thu Dec 15 18:14:06 2005
-+++ make_freebsd.mak Thu Dec 15 18:25:59 2005
+--- make_freebsd.mak.orig Wed Jan 4 08:43:21 2006
++++ make_freebsd.mak Wed Jan 4 08:44:07 2006
@@ -9,7 +9,7 @@
# IBM Corporation - initial API and implementation
#************************************************************************=
*******
@@ -9,16 +9,19 @@
=20
include make_common.mak
=20
-@@ -61,7 +61,7 @@
+@@ -61,32 +61,34 @@
-fPIC \
-I./ \
-I$(JAVA_HOME)/include \
- -I$(JAVA_HOME)/include/linux \
+ -I$(JAVA_HOME)/include/freebsd \
${GECKO_INCLUDES} \
- ${SWT_PTR_CFLAGS}
+- ${SWT_PTR_CFLAGS}
++ ${SWT_PTR_CFLAGS} \
++ $(CFLAGS)
+ =09
+ MOZILLALIBS =3D -shared -s -Wl,--version-script=3Dmozilla_exports -Bsymbo=
lic ${GECKO_LIBS}
=09
-@@ -70,7 +70,7 @@
SWT_OBJECTS =3D swt.o callback.o
AWT_OBJECTS =3D swt_awt.o
SWTPI_OBJECTS =3D swt.o os.o os_structs.o os_custom.o os_stats.o
@@ -27,8 +30,9 @@
ATK_OBJECTS =3D swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
GNOME_OBJECTS =3D swt.o gnome.o gnome_structs.o gnome_stats.o
MOZILLA_OBJECTS =3D swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_st=
ats.o
-@@ -78,15 +78,16 @@
- CFLAGS =3D -O -Wall \
+ =20
+-CFLAGS =3D -O -Wall \
++CFLAGS +=3D -Wall \
-DSWT_VERSION=3D$(SWT_VERSION) \
$(NATIVE_STATS) \
- -DLINUX -DGTK \
@@ -49,7 +53,7 @@
=20
#
# SWT libs
-@@ -123,8 +124,6 @@
+@@ -123,8 +125,6 @@
=20
cairo.o: cairo.c cairo.h swt.h
$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
--AhhlLboLdkugWU4S--
--2B/JsCI69OhZNC5r
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)
iD8DBQFDu7FhrxEiaFLzGQwRAtumAJ445jY8XItGr7xEwCOfVWVd1Xq0wQCeKPnk
s19p1FLm6hqeUNifm17eqvs=
=h7aV
-----END PGP SIGNATURE-----
--2B/JsCI69OhZNC5r--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060104112833.79463.qmail>