cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile-openbsd-x86-64.gmake comes from files/, so modify it there rather

Browse Source 
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).
This commit is contained in:
sthen 2015-05-18 09:17:42 +00:00
parent 9334187dce
commit 0c13d11cc0
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/tanukiwrapper/files/Makefile-openbsd-x86-64.gmake
View File

@ -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

12
java/tanukiwrapper/patches/patch-src_c_Makefile-openbsd-x86-64_gmake
View File

@ -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