diff options
Diffstat (limited to '0006-cygwin-uses-cyg-library-prefix.patch')
-rw-r--r-- | 0006-cygwin-uses-cyg-library-prefix.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/0006-cygwin-uses-cyg-library-prefix.patch b/0006-cygwin-uses-cyg-library-prefix.patch deleted file mode 100644 index 2914347..0000000 --- a/0006-cygwin-uses-cyg-library-prefix.patch +++ /dev/null @@ -1,51 +0,0 @@ -From aa3bb322bfa366fee3cfd83646bd0c049957ff05 Mon Sep 17 00:00:00 2001 -From: Jonathan Yong <10walls@gmail.com> -Date: Sat, 28 Jun 2014 08:48:56 +0800 -Subject: [PATCH 06/21] cygwin uses cyg library prefix - ---- - libjava/include/posix.h | 6 ++++++ - libjava/java/net/natVMURLConnection.cc | 4 ++++ - 2 files changed, 10 insertions(+) - -diff --git a/libjava/include/posix.h b/libjava/include/posix.h -index 6bd560c..cbda784 100644 ---- a/libjava/include/posix.h -+++ b/libjava/include/posix.h -@@ -42,11 +42,17 @@ details. */ - #include <java/util/Properties.h> - - // Prefix and suffix for shared libraries. -+#ifdef __CYGWIN__ -+#define _Jv_platform_solib_prefix "cyg" -+#else - #define _Jv_platform_solib_prefix "lib" -+#endif - #if defined(__APPLE__) && defined(__MACH__) - #define _Jv_platform_solib_suffix ".dylib" - #elif defined(HPUX) && defined(HP_PA) - #define _Jv_platform_solib_suffix ".sl" -+#elif defined(__CYGWIN__) -+#define _Jv_platform_solib_suffix ".dll" - #else - #define _Jv_platform_solib_suffix ".so" - #endif -diff --git a/libjava/java/net/natVMURLConnection.cc b/libjava/java/net/natVMURLConnection.cc -index 0a30a21..810e045 100644 ---- a/libjava/java/net/natVMURLConnection.cc -+++ b/libjava/java/net/natVMURLConnection.cc -@@ -32,7 +32,11 @@ void - java::net::VMURLConnection::init () - { - #if defined (HAVE_MAGIC_T) && defined (HAVE_MAGIC_H) && defined (USE_LTDL) -+#ifdef __CYGWIN__ -+ lt_dlhandle handle = lt_dlopenext ("cygmagic-1.dll"); -+#else - lt_dlhandle handle = lt_dlopenext ("libmagic.so"); -+#endif - if (!handle) - return; - --- -2.4.5 - |