463496f59a
The removed hunk is definitely wrong, but I can't figure out what it was trying to do. I think the patch hunk was accidentally reintroduced in r1.4 after being correctly removed in r1.3. The reason it is wrong is because it breaks later tests by introducing code into confdefs.h. The following tests always break, because they have duplicate main() definitions. Build test on NetBSD works because the java support isn't in the suggested options anyway.
26 lines
930 B
Text
26 lines
930 B
Text
$NetBSD: patch-libjava_configure,v 1.5 2015/06/03 06:48:54 dsainty Exp $
|
|
|
|
Avoid a reference to the wrapped make in the pkgsrc work directory from
|
|
showing up in an installed file.
|
|
See: libjava/contrib/aotcompile.py.in
|
|
|
|
--- libjava/configure.orig 2014-04-04 13:53:39.000000000 +0000
|
|
+++ libjava/configure
|
|
@@ -20760,7 +20760,7 @@ case "$THREADS" in
|
|
# support for weak references to pthread_* functions ala gthr.h API.
|
|
THREADSPEC='%{!pthread: %{!shared: %eUnder this configuration, the user must provide -pthread when linking.}}'
|
|
;;
|
|
- *-*-freebsd*)
|
|
+ *-*-freebsd* | *-*-openbsd*)
|
|
# FreeBSD >=5.3 implements a model much closer to other modern UNIX
|
|
# systems which support threads and -lpthread.
|
|
THREADLDFLAGS=-pthread
|
|
@@ -24873,7 +24873,7 @@ $as_echo "Python modules dir: ${python_m
|
|
|
|
|
|
# needed for aot-compile-rpm
|
|
-MAKE=`which make`
|
|
+MAKE=${PKGSRC_MAKE}
|
|
|
|
|
|
# Check whether --enable-aot-compile-rpm was given.
|