diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2021-10-23 14:23:03 +0200 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2021-10-23 14:24:24 +0200 |
| commit | 52753ef674d4ff3f90dd796375e80cc505550303 (patch) | |
| tree | ffefa13918263ffc097e80119ff6300893d9807f /net-libs/NativeThread | |
| parent | net-libs/NativeThread: min java 1.8 (diff) | |
| download | gentoo-52753ef674d4ff3f90dd796375e80cc505550303.tar.gz gentoo-52753ef674d4ff3f90dd796375e80cc505550303.tar.bz2 gentoo-52753ef674d4ff3f90dd796375e80cc505550303.zip | |
net-libs/NativeThread: added missing dep, switched to javac -h
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'net-libs/NativeThread')
| -rw-r--r-- | net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild | 17 | ||||
| -rw-r--r-- | net-libs/NativeThread/files/NativeThread-0_pre20190914-javah.patch | 14 |
2 files changed, 28 insertions, 3 deletions
diff --git a/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild b/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild index f0565f04c47b..1156f64a3ad3 100644 --- a/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild +++ b/net-libs/NativeThread/NativeThread-0_pre20190914-r1.ebuild @@ -13,12 +13,23 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND=">=net-p2p/freenet-0.7 - virtual/jdk:1.8" -RDEPEND="virtual/jre:1.8" +CDEPEND=" + dev-java/jna:4 +" +DEPEND="net-p2p/freenet + >=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" S="${WORKDIR}" +PATCHES=( + "${FILESDIR}/${P}-javah.patch" +) + +src_prepare() { + default +} + src_compile() { append-flags -fPIC tc-export CC diff --git a/net-libs/NativeThread/files/NativeThread-0_pre20190914-javah.patch b/net-libs/NativeThread/files/NativeThread-0_pre20190914-javah.patch new file mode 100644 index 000000000000..ceefc8f36d70 --- /dev/null +++ b/net-libs/NativeThread/files/NativeThread-0_pre20190914-javah.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index 0a879d2..b0b45d1 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,7 +9,8 @@ libNativeThread.so: NativeThread.c NativeThread.h + $(CC) $(CFLAGS) -o libNativeThread.so $(LDFLAGS) NativeThread.c $(LIBS) + + NativeThread.h: +- javah -o NativeThread.h -classpath /usr/share/freenet/lib/freenet.jar freenet.support.io.NativeThread ++ javac -h . -classpath /usr/share/freenet/lib/freenet.jar:/usr/share/jna-4/lib/jna.jar:/usr/share/jna-4/lib/jna-platform.jar NativeThread.java ++ mv freenet_support_io_NativeThread_LinuxNativeThread.h NativeThread.h + + clean: + rm -f NativeThread.h libNativeThread*.so |