diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-02-27 05:19:27 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-02-27 05:19:27 +0000 |
| commit | 628cef3d336f0e8e43c1d662a568065054af3b18 (patch) | |
| tree | b0ecf38818e02af9b883143fceda88c2ff392317 | |
| parent | bb85932fd8a1dde75d7d62044be16f6f83884f68 (diff) | |
make quick update to make dlopen patch apply cleanly to 0.39.2
svn path=/trunk/; revision=4619
| -rw-r--r-- | packages/patches/TODO | 3 | ||||
| -rw-r--r-- | packages/patches/darwin/darwin_dlopen.patch | 21 |
2 files changed, 3 insertions, 21 deletions
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) |