From 0c13d11cc00f9be658f30dc33cd43cff6bf93466 Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 18 May 2015 09:17:42 +0000 Subject: [PATCH] Makefile-openbsd-x86-64.gmake comes from files/, so modify it there rather than patching. Since only the relevant version for the current arch is copied into the build directory, patching fails on arch other than amd64 with comic results (I had a log with 300GB of "No file found--skip this patch? [n]" / "File to patch:" lines). --- .../files/Makefile-openbsd-x86-64.gmake | 2 +- .../patch-src_c_Makefile-openbsd-x86-64_gmake | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 java/tanukiwrapper/patches/patch-src_c_Makefile-openbsd-x86-64_gmake diff --git a/java/tanukiwrapper/files/Makefile-openbsd-x86-64.gmake b/java/tanukiwrapper/files/Makefile-openbsd-x86-64.gmake index 48b8d07b6ee..e0fa07581c9 100644 --- a/java/tanukiwrapper/files/Makefile-openbsd-x86-64.gmake +++ b/java/tanukiwrapper/files/Makefile-openbsd-x86-64.gmake @@ -7,7 +7,7 @@ # license agreement you entered into with Tanuki Software. # http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html -CC = ${CC} -Wall -pedantic -DOPENBSD -DJSW64 -I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv -DUNICODE -D_UNICODE +CC = ${CC} -Wall -fPIC -pedantic -DOPENBSD -DJSW64 -I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv -DUNICODE -D_UNICODE INCLUDE=$(JAVA_HOME)/include diff --git a/java/tanukiwrapper/patches/patch-src_c_Makefile-openbsd-x86-64_gmake b/java/tanukiwrapper/patches/patch-src_c_Makefile-openbsd-x86-64_gmake deleted file mode 100644 index 7797e32a340..00000000000 --- a/java/tanukiwrapper/patches/patch-src_c_Makefile-openbsd-x86-64_gmake +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_c_Makefile-openbsd-x86-64_gmake,v 1.1 2015/05/16 10:59:22 kettenis Exp $ ---- src/c/Makefile-openbsd-x86-64.gmake.orig Sat May 16 12:23:42 2015 -+++ src/c/Makefile-openbsd-x86-64.gmake Sat May 16 12:25:18 2015 -@@ -7,7 +7,7 @@ - # license agreement you entered into with Tanuki Software. - # http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html - --CC = ${CC} -Wall -pedantic -DOPENBSD -DJSW64 -I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv -DUNICODE -D_UNICODE -+CC = ${CC} -fPIC -Wall -pedantic -DOPENBSD -DJSW64 -I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv -DUNICODE -D_UNICODE - - INCLUDE=$(JAVA_HOME)/include -