diff options
Diffstat (limited to 'meta-oe/recipes-core')
-rw-r--r-- | meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/create-as-shared-lib.patch | 31 | ||||
-rw-r--r-- | meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/stub-only.patch | 72 |
2 files changed, 0 insertions, 103 deletions
diff --git a/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/create-as-shared-lib.patch b/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/create-as-shared-lib.patch deleted file mode 100644 index 306e3b8212..0000000000 --- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/create-as-shared-lib.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/src/proxy-libintl/Makefile.org 2009-09-12 23:19:04.989421607 -0700 -+++ a/src/proxy-libintl/Makefile 2009-09-12 23:21:14.100640001 -0700 -@@ -4,20 +4,20 @@ ZIPFILE = proxy-libintl-$(TIMESTAMP).zip - CC = gcc - CFLAGS = -Wall -I ../../include - --all : ../../lib/libintl.a ../../lib/intl.lib -+all : ../../lib/libintl.so ../../lib/intl.lib - --../../lib/libintl.a : libintl.o -- ar rc $@ libintl.o -+../../lib/libintl.so : libintl.o -+ $(CC) -shared -o $@ libintl.o - --../../lib/intl.lib : ../../lib/libintl.a -- cp ../../lib/libintl.a $@ -- strip --strip-unneeded $@ -+../../lib/intl.lib : ../../lib/libintl.so -+ cp ../../lib/libintl.so $@ -+ $(STRIP) --strip-unneeded $@ - - libintl.o : libintl.c - $(CC) $(CFLAGS) -c libintl.c - - clean : -- rm -f *.o ../../lib/libintl.a ../../$(ZIPFILE) -+ rm -f *.o ../../lib/libintl.so ../../$(ZIPFILE) - - dist : clean all -- cd ../..; zip $(ZIPFILE) include/libintl.h lib/{libintl.a,intl.lib} src/proxy-libintl/{README.txt,COPYING.LIB.txt,Makefile,libintl.[ch]}; manifestify $(ZIPFILE) -+ cd ../..; zip $(ZIPFILE) include/libintl.h lib/{libintl.so,intl.lib} src/proxy-libintl/{README.txt,COPYING.LIB.txt,Makefile,libintl.[ch]}; manifestify $(ZIPFILE) diff --git a/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/stub-only.patch b/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/stub-only.patch deleted file mode 100644 index 7186b13c06..0000000000 --- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/stub-only.patch +++ /dev/null @@ -1,72 +0,0 @@ -Index: proxy-libintl/src/proxy-libintl/libintl.c -=================================================================== ---- proxy-libintl.orig/src/proxy-libintl/libintl.c -+++ proxy-libintl/src/proxy-libintl/libintl.c -@@ -18,9 +18,12 @@ - */ - - #ifdef _WIN32 --#include <windows.h> -+# include <windows.h> - #else --#include <dlfcn.h> -+# include <stddef.h> -+# if !STUB_ONLY -+# include <dlfcn.h> -+# endif - typedef void* HMODULE; - #endif - -@@ -65,11 +68,13 @@ static char * (*p_bind_textdomain_codese - static int - use_intl_dll (HMODULE dll) - { --#ifdef _WIN32 --#define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0 --#else --#define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0 --#endif -+#if !STUB_ONLY -+# ifdef _WIN32 -+# define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0 -+# else -+# define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0 -+# endif /* _WIN32 */ -+ - - LOOKUP (gettext); - LOOKUP (dgettext); -@@ -82,7 +87,7 @@ use_intl_dll (HMODULE dll) - LOOKUP (bind_textdomain_codeset); - - #undef LOOKUP -- -+#endif /* !STUB_ONLY */ - return 1; - } - -@@ -171,13 +176,17 @@ setup (void) - - if (!beenhere) - { --#ifdef _WIN32 -- HMODULE intl_dll = LoadLibrary ("intl.dll"); --#elif defined(__APPLE__) && defined(__MACH__) -- HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY); --#else -- HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY); --#endif -+#if !STUB_ONLY -+# ifdef _WIN32 -+ HMODULE intl_dll = LoadLibrary ("intl.dll"); -+# elif defined(__APPLE__) && defined(__MACH__) -+ HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY); -+# else -+ HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY); -+# endif -+#else /* !STUB_ONLY */ -+ HMODULE intl_dll = NULL; -+#endif /* STUB_ONLY */ - - if (intl_dll != NULL && - use_intl_dll (intl_dll)) |