summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Housley <jeh@FreeBSD.org>2000-10-18 21:28:28 +0000
committerJames E. Housley <jeh@FreeBSD.org>2000-10-18 21:28:28 +0000
commit57ba1b479287e368a129edc7bfa353c053eed702 (patch)
tree532a40754601c2f9e7085a62e4bcaf3126397d4a
parentClean up the patch section of the Makefile. Added one level of (diff)
Clean up the patch section of the Makefile. Added one level of
directories to patch-a[ab] to make the Makefile simpler
-rw-r--r--devel/i386-rtems-gcj/Makefile13
-rw-r--r--devel/i386-rtems-gcj/files/patch-aa4
-rw-r--r--devel/i386-rtems-gcj/files/patch-ab4
3 files changed, 7 insertions, 14 deletions
diff --git a/devel/i386-rtems-gcj/Makefile b/devel/i386-rtems-gcj/Makefile
index 2c71c62026cb..f42dde978513 100644
--- a/devel/i386-rtems-gcj/Makefile
+++ b/devel/i386-rtems-gcj/Makefile
@@ -43,17 +43,10 @@ CONFIGURE_ARGS?= --with-gnu-as --with-gnu-ld --with-newlib --verbose \
CONFIGURE_WRKSRC?= ${WRKDIR}/build-${LCLTARGET}
CONFIGURE_SCRIPT?= ../${JAVANAME}/configure
-MAKE_FLAGS= LANGUAGES="java"
+PATCH_WRKSRC= ${WRKDIR}
+PATCH_STRIP= -p
-.if defined(PATCH_DEBUG)
-PATCH_DEBUG_TMP= yes
-PATCH_ARGS= -d ${WRKDIR}/${JAVANAME} -E ${PATCH_STRIP}
-PATCH_DIST_ARGS= -d ${WRKDIR} -E ${PATCH_DIST_STRIP}
-.else
-PATCH_DEBUG_TMP= no
-PATCH_ARGS= -d ${WRKDIR}/${JAVANAME} --forward --quiet -E ${PATCH_STRIP}
-PATCH_DIST_ARGS= -d ${WRKDIR} --forward --quiet -E ${PATCH_DIST_STRIP}
-.endif
+MAKE_FLAGS= LANGUAGES="java"
pre-configure:
@(cd ${WRKDIR} ; \
diff --git a/devel/i386-rtems-gcj/files/patch-aa b/devel/i386-rtems-gcj/files/patch-aa
index f71891546ce9..73960afa69fc 100644
--- a/devel/i386-rtems-gcj/files/patch-aa
+++ b/devel/i386-rtems-gcj/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig Fri Sep 1 21:07:00 2000
-+++ Makefile.in Fri Sep 1 21:16:11 2000
+--- gcc-2.95.2/Makefile.in.orig Fri Sep 1 21:07:00 2000
++++ gcc-2.95.2/Makefile.in Fri Sep 1 21:16:11 2000
@@ -656,9 +656,7 @@
install-autoconf \
install-automake \
diff --git a/devel/i386-rtems-gcj/files/patch-ab b/devel/i386-rtems-gcj/files/patch-ab
index ac40a7a6dd68..1f99506f8f1f 100644
--- a/devel/i386-rtems-gcj/files/patch-ab
+++ b/devel/i386-rtems-gcj/files/patch-ab
@@ -1,5 +1,5 @@
---- gcc/Makefile.in.orig Fri Aug 13 03:46:55 1999
-+++ gcc/Makefile.in Fri Sep 1 21:15:38 2000
+--- gcc-2.95.2/gcc/Makefile.in.orig Fri Aug 13 03:46:55 1999
++++ gcc-2.95.2/gcc/Makefile.in Fri Sep 1 21:15:38 2000
@@ -400,7 +400,7 @@
MAYBE_USE_COLLECT2 = @maybe_use_collect2@
# It is convenient for configure to add the assignment at the beginning,