diff options
| author | dsainty <dsainty@pkgsrc.org> | 2015-06-03 06:48:54 +0000 |
|---|---|---|
| committer | dsainty <dsainty@pkgsrc.org> | 2015-06-03 06:48:54 +0000 |
| commit | 878dae7fdc8d1b33039ad01d09cee3af3910a1da (patch) | |
| tree | bec82d452ced931d5424c1c381d89f91ead5d631 /lang | |
| parent | e28681f7dc208596d6fb8fc87c0d7294ace5906f (diff) | |
| download | pkgsrc-878dae7fdc8d1b33039ad01d09cee3af3910a1da.tar.gz | |
Fix build on Linux by removing erroneous patching.
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.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc48/distinfo | 4 | ||||
| -rw-r--r-- | lang/gcc48/patches/patch-libjava_configure | 21 |
2 files changed, 4 insertions, 21 deletions
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo index 7c108f9a2e6..8bace0b9987 100644 --- a/lang/gcc48/distinfo +++ b/lang/gcc48/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2015/03/12 14:56:13 ryoon Exp $ +$NetBSD: distinfo,v 1.23 2015/06/03 06:48:54 dsainty Exp $ SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a @@ -68,7 +68,7 @@ SHA1 (patch-libgo_config_ltmain.sh) = 703a27554e479cc2e48410a6bb0e5f5b4be2c150 SHA1 (patch-libgomp_configure) = 8527167e1f08ac7e64277ac0d22532dd59394b64 SHA1 (patch-libiberty_cp-demangle.c) = 4f9a29efadd5dedd1de796c58389f9ed8b62ab74 SHA1 (patch-libjava_boehm.cc) = b18bc9d410a62543583c77e011f50b86f41ca18a -SHA1 (patch-libjava_configure) = ddf1388e14c3ff83efdd7ba4a40609b275f7d922 +SHA1 (patch-libjava_configure) = cf31039797226620dd9cc2a65209b354e2a74f0c SHA1 (patch-libjava_configure.host) = 194b88bfe2c2ed24fd7bc5b6b84c70d7329bf1b2 SHA1 (patch-libjava_contrib_rebuild-gcj-db.in) = bb01d738fc7db05046ae37e8ade32574de1d8297 SHA1 (patch-libjava_libltdl_configure) = aed53e3063685d16a9dbd4c494e40be2a2ecede4 diff --git a/lang/gcc48/patches/patch-libjava_configure b/lang/gcc48/patches/patch-libjava_configure index 0f888408a44..b5b522b43a9 100644 --- a/lang/gcc48/patches/patch-libjava_configure +++ b/lang/gcc48/patches/patch-libjava_configure @@ -1,6 +1,4 @@ -$NetBSD: patch-libjava_configure,v 1.4 2014/11/28 09:57:32 obache Exp $ - -Detect gethostbyname_r properly. +$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. @@ -17,22 +15,7 @@ See: libjava/contrib/aotcompile.py.in # FreeBSD >=5.3 implements a model much closer to other modern UNIX # systems which support threads and -lpthread. THREADLDFLAGS=-pthread -@@ -22020,6 +22020,14 @@ do : - if test "x$ac_cv_func_gethostbyname_r" = x""yes; then : - cat >>confdefs.h <<_ACEOF - #define HAVE_GETHOSTBYNAME_R 1 -+#include <netdb.h> -+int -+main () -+{ -+gethostbyname_r("", 0, 0); -+; -+return 0; -+} - _ACEOF - - -@@ -24873,7 +24881,7 @@ $as_echo "Python modules dir: ${python_m +@@ -24873,7 +24873,7 @@ $as_echo "Python modules dir: ${python_m # needed for aot-compile-rpm |