diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2013-06-28 15:44:38 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2013-06-28 15:44:38 -0500 |
| commit | 08163f0587b4807e32a9fc0e4a887c8d45a641d1 (patch) | |
| tree | b411b3acc12e3f769fbd69d552a57a96c1138352 /gcc47-java-jni.patch | |
| parent | 8cc9e7a9383915ffc95341f09ad495f309184351 (diff) | |
| download | cygwin-gcc-08163f0587b4807e32a9fc0e4a887c8d45a641d1.tar.gz cygwin-gcc-08163f0587b4807e32a9fc0e4a887c8d45a641d1.tar.xz cygwin-gcc-08163f0587b4807e32a9fc0e4a887c8d45a641d1.zip | |
cygwin-gcc 4.7.3
Diffstat (limited to 'gcc47-java-jni.patch')
| -rw-r--r-- | gcc47-java-jni.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/gcc47-java-jni.patch b/gcc47-java-jni.patch new file mode 100644 index 0000000..327bd70 --- /dev/null +++ b/gcc47-java-jni.patch @@ -0,0 +1,56 @@ +--- origsrc/gcc-4.5.0/libjava/classpath/configure.ac 2009-02-05 17:26:08.000000000 -0600 ++++ src/gcc-4.5.0/libjava/classpath/configure.ac 2009-12-06 01:58:25.091013300 -0600 +@@ -26,7 +26,7 @@ case "$host_os" in + cp_module="" + ;; + *) +- cp_module="-module" ++ cp_module="-module -avoid-version" + ;; + esac + +--- origsrc/gcc-4.7.2/libjava/classpath/configure 2011-11-29 14:12:00.000000000 -0600 ++++ src/gcc-4.7.2/libjava/classpath/configure 2013-03-01 01:48:05.585762700 -0600 +@@ -3172,7 +3172,7 @@ case "$host_os" in + cp_module="" + ;; + *) +- cp_module="-module" ++ cp_module="-module -avoid-version" + ;; + esac + +--- origsrc/gcc-4.7.2/libjava/include/posix.h 2011-01-03 14:52:22.000000000 -0600 ++++ src/gcc-4.7.2/libjava/include/posix.h 2013-03-06 20:26:16.157459700 -0600 +@@ -47,11 +47,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 +--- origsrc/gcc-4.7.2/libjava/java/net/natVMURLConnection.cc 2009-12-01 16:05:25.000000000 -0600 ++++ src/gcc-4.7.2/libjava/java/net/natVMURLConnection.cc 2013-03-06 20:20:42.202970700 -0600 +@@ -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; + |