Attachment #239563 for bug #269034

View | Details | Raw Unified | Return to bug 269034
Collapse All | Expand All





SUB_FILES=	${PORTNAME}

MAVEN_ENV=	MAVEN_OPTS=-Xmx1024m CC=${CC} CFLAGS="${CFLAGS}" JAVA_HOME=${JAVA_HOME} HOME=${WRKDIR}/githome
MAVEN_ECLIPSE=	-Dmaven.repo.local=${WRKDIR}/eclipse-maven-repo-${PORTVERSION} \
		-Dnative=gtk.freebsd.${ARCH} \
		-DforceContextQualifier=v${ECLIPSE_TSTAMP}

ECLIPSE_RESULT=	eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/products/org.eclipse.sdk.ide-freebsd.gtk.${ARCH}.tar.gz

.include <bsd.port.pre.mk>

.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 150
CFLAGS+=	-Wno-deprecated-non-prototype
.endif

do-build:
	cd ${WRKSRC} && ${SETENV} ${MAVEN_ENV} mvn --offline ${MAVEN_ECLIPSE} -DskipTests clean verify


	cd ${STAGEDIR}${PREFIX} && ${FIND} -s bin/${PORTNAME} share/${PORTNAME} -not -type d >> ${TMPPLIST}
	cd ${STAGEDIR}${PREFIX} && ${FIND} -ds share/${PORTNAME} -type d | ${SED} -e 's,^,@dir ,' >> ${TMPPLIST}

.include <bsd.port.post.mk>




diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	0000-00-00 00:00:00.000000000 +0000
@@ -72,9 +72,9 @@
 
 cd `dirname $0`
 
-MAKE_TYPE=make
+MAKE_TYPE=gmake
 
-export CFLAGS='-O -Wall -fPIC'
+export CFLAGS="${CFLAGS--O -Wall} -fPIC"
 
 # Determine which OS we are on
 if [ "${OS}" = "" ]; then
@@ -86,27 +86,30 @@
 		MAKEFILE=make_win32.mak
 		;;

Return to bug 269034

Lines 65-77 DESKTOP_ENTRIES="Eclipse" \ Link Here

(-)b/java/eclipse/Makefile (-2 / +8 lines)
65		65
66	SUB_FILES= ${PORTNAME}	66	SUB_FILES= ${PORTNAME}
67		67
68	MAVEN_ENV= MAVEN_OPTS=-Xmx1024m CC=${CC} JAVA_HOME=${JAVA_HOME} HOME=${WRKDIR}/githome	68	MAVEN_ENV= MAVEN_OPTS=-Xmx1024m CC=${CC} CFLAGS="${CFLAGS}" JAVA_HOME=${JAVA_HOME} HOME=${WRKDIR}/githome
69	MAVEN_ECLIPSE= -Dmaven.repo.local=${WRKDIR}/eclipse-maven-repo-${PORTVERSION} \	69	MAVEN_ECLIPSE= -Dmaven.repo.local=${WRKDIR}/eclipse-maven-repo-${PORTVERSION} \
70	-Dnative=gtk.freebsd.${ARCH} \	70	-Dnative=gtk.freebsd.${ARCH} \
71	-DforceContextQualifier=v${ECLIPSE_TSTAMP}	71	-DforceContextQualifier=v${ECLIPSE_TSTAMP}
72		72
73	ECLIPSE_RESULT= eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/products/org.eclipse.sdk.ide-freebsd.gtk.${ARCH}.tar.gz	73	ECLIPSE_RESULT= eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/products/org.eclipse.sdk.ide-freebsd.gtk.${ARCH}.tar.gz
74		74
		75	.include <bsd.port.pre.mk>
		76
		77	.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 150
		78	CFLAGS+= -Wno-deprecated-non-prototype
		79	.endif
		80
75	do-build:	81	do-build:
76	cd ${WRKSRC} && ${SETENV} ${MAVEN_ENV} mvn --offline ${MAVEN_ECLIPSE} -DskipTests clean verify	82	cd ${WRKSRC} && ${SETENV} ${MAVEN_ENV} mvn --offline ${MAVEN_ECLIPSE} -DskipTests clean verify
77		83
Lines 85-88 post-install: Link Here
85	cd ${STAGEDIR}${PREFIX} && ${FIND} -s bin/${PORTNAME} share/${PORTNAME} -not -type d >> ${TMPPLIST}	91	cd ${STAGEDIR}${PREFIX} && ${FIND} -s bin/${PORTNAME} share/${PORTNAME} -not -type d >> ${TMPPLIST}
86	cd ${STAGEDIR}${PREFIX} && ${FIND} -ds share/${PORTNAME} -type d \| ${SED} -e 's,^,@dir ,' >> ${TMPPLIST}	92	cd ${STAGEDIR}${PREFIX} && ${FIND} -ds share/${PORTNAME} -type d \| ${SED} -e 's,^,@dir ,' >> ${TMPPLIST}
87		93
88	.include <bsd.port.mk>	94	.include <bsd.port.post.mk>

Lines 53-67 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/ Link Here

(-)b/java/eclipse/files/patch-eclipse.platform.swt (-2 / +5 lines)
53	diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	53	diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
54	--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 0000-00-00 00:00:00.000000000 +0000	54	--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 0000-00-00 00:00:00.000000000 +0000
55	+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 0000-00-00 00:00:00.000000000 +0000	55	+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 0000-00-00 00:00:00.000000000 +0000
56	@@ -72,7 +72,7 @@	56	@@ -72,9 +72,9 @@
57		57
58	cd `dirname $0`	58	cd `dirname $0`
59		59
60	-MAKE_TYPE=make	60	-MAKE_TYPE=make
61	+MAKE_TYPE=gmake	61	+MAKE_TYPE=gmake
62		62
63	export CFLAGS='-O -Wall -fPIC'	63	-export CFLAGS='-O -Wall -fPIC'
		64	+export CFLAGS="${CFLAGS--O -Wall} -fPIC"
64		65
		66	# Determine which OS we are on
		67	if [ "${OS}" = "" ]; then
65	@@ -86,27 +86,30 @@	68	@@ -86,27 +86,30 @@
66	MAKEFILE=make_win32.mak	69	MAKEFILE=make_win32.mak
67	;;	70	;;