From 628cef3d336f0e8e43c1d662a568065054af3b18 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 27 Feb 2006 05:19:27 +0000 Subject: make quick update to make dlopen patch apply cleanly to 0.39.2 svn path=/trunk/; revision=4619 --- packages/patches/TODO | 3 +++ packages/patches/darwin/darwin_dlopen.patch | 21 --------------------- 2 files changed, 3 insertions(+), 21 deletions(-) create mode 100644 packages/patches/TODO (limited to 'packages/patches') diff --git a/packages/patches/TODO b/packages/patches/TODO new file mode 100644 index 00000000..841a07e7 --- /dev/null +++ b/packages/patches/TODO @@ -0,0 +1,3 @@ + +- port packages/patches/libdir-0.38.4.patch to 0.39.2 + diff --git a/packages/patches/darwin/darwin_dlopen.patch b/packages/patches/darwin/darwin_dlopen.patch index a93ef7ed..971ad391 100644 --- a/packages/patches/darwin/darwin_dlopen.patch +++ b/packages/patches/darwin/darwin_dlopen.patch @@ -42,24 +42,3 @@ diff -u -w -r1.4 s_loader.c { NSObjectFileImage image; void *ret; -@@ -134,8 +137,18 @@ - return 0; - } - ret = NSLinkModule( image, filename, -- NSLINKMODULE_OPTION_BINDNOW + NSLINKMODULE_OPTION_PRIVATE); -- -+ NSLINKMODULE_OPTION_BINDNOW | -+ //NSLINKMODULE_OPTION_PRIVATE | -+ NSLINKMODULE_OPTION_RETURN_ON_ERROR); -+ -+ if (ret == NULL) { -+ int err; -+ const char *fname, *errt; -+ NSLinkEditErrors c; -+ NSLinkEditError(&c, &err, &fname, &errt); -+ post("link error %d %s %s", err, fname, errt); -+ return 0; -+ } - s = NSLookupSymbolInModule(ret, symname); - - if (s) -- cgit v1.2.1