Charles Davis wrote:
> On Sep 30, 2011, at 5:26 PM, mrivera wrote:
>
> > ../../../tools/winegcc/winegcc -m32 -B../../../tools/winebuild --sysroot=../../.. -s -Wb,-F,advapi32_test.exe cred.o crypt.o crypt_lmhash.o crypt_md4.o crypt_md5.o crypt_sha.o eventlog.o lsa.o registry.o security.o service.o testlist.o -o advapi32_test-stripped.exe.so ../../../libs/port/libwine_port.a -lole32 -ladvapi32
> > /usr/libexec/gcc/i686-apple-darwin8/4.0.1/ld: can't use -s with -bundle (file must contain at least global symbols, for maximum stripping use -x)
> >
> Does this patch help? (Copy and paste into a plain text file, save it, and then apply with patch(1) like so:
>
> patch -p1 <patchfile.txt
>
> or git apply if you're building from git:
>
> git apply patchfile.txt
>
> from the wine source directory. Replace 'patchfile.txt' with whatever you saved the patch file as.)
>
> Chip
>
> diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
> index 3a7e93a..adb1873 100644
> --- a/tools/winegcc/winegcc.c
> +++ b/tools/winegcc/winegcc.c
> @@ -199,6 +199,7 @@ struct options
> int force_pointer_size;
> int large_address_aware;
> int unwind_tables;
> + int strip;
> const char* wine_objdir;
> const char* output_name;
> const char* image_base;
> @@ -1009,6 +1010,8 @@ static void build(struct options* opts)
> strarray_add(link_args, "-image_base");
> strarray_add(link_args, opts->image_base);
> }
> + if (opts->strip)
> + strarray_add(link_args, "-Wl,-x");
> break;
> case PLATFORM_SOLARIS:
> {
> @@ -1417,6 +1420,15 @@ int main(int argc, char **argv)
> opts.shared = 1;
> raw_compiler_arg = raw_linker_arg = 0;
> }
> + else if (strcmp("-s", argv[i]) == 0 && opts.target_platform == PLATFORM_APPLE)
> + {
> + /* On Mac, change -s into -Wl,-x. ld's -s switch
> + * is deprecated, and it doesn't work on Tiger with
> + * MH_BUNDLEs anyway
> + */
> + opts.strip = 1;
> + raw_linker_arg = 0;
> + }
> break;
> case 'v':
> if (argv[i][2] == 0) verbose++;
> --
> 1.7.6.1
I copied everything from the end of your post, went into textedit, pasted it, saved it as a txt file. Then did this..
michael-riveras-computer:~/desktop/wine-1.3.29 michaelrivera$ patch -p1 <patchfile.txt
patching file tools/winegcc/winegcc.c
patch: **** malformed patch at line 6: int force_pointer_size;
Then ran the installer again and ended up with this. Did I do something wrong?
./tools/winebuild/winebuild -m32 -w --def -o dlls/sti/libsti.def --export ./dlls/sti/sti.spec
make[1]: Nothing to be done for `all'.
make[1]: Nothing to be done for `all'.
./tools/winebuild/winebuild -m32 -w --def -o dlls/tapi32/libtapi32.def --export ./dlls/tapi32/tapi32.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/unicows/libunicows.def --export ./dlls/unicows/unicows.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/url/liburl.def --export ./dlls/url/url.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/urlmon/liburlmon.def --export ./dlls/urlmon/urlmon.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/usbd.sys/libusbd.sys.def --export ./dlls/usbd.sys/usbd.sys.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/user32/libuser32.def --export ./dlls/user32/user32.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/userenv/libuserenv.def --export ./dlls/userenv/userenv.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/usp10/libusp10.def --export ./dlls/usp10/usp10.spec
make[1]: Nothing to be done for `all'.
./tools/winebuild/winebuild -m32 -w --def -o dlls/uxtheme/libuxtheme.def --export ./dlls/uxtheme/uxtheme.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/vdmdbg/libvdmdbg.def --export ./dlls/vdmdbg/vdmdbg.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/version/libversion.def --export ./dlls/version/version.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/wer/libwer.def --export ./dlls/wer/wer.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/windowscodecs/libwindowscodecs.def --export ./dlls/windowscodecs/windowscodecs.spec
make[1]: Nothing to be done for `all'.
./tools/winebuild/winebuild -m32 -w --def -o dlls/wined3d/libwined3d.def --export ./dlls/wined3d/wined3d.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/winhttp/libwinhttp.def --export ./dlls/winhttp/winhttp.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/wininet/libwininet.def --export ./dlls/wininet/wininet.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/winmm/libwinmm.def --export ./dlls/winmm/winmm.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/winnls32/libwinnls32.def --export ./dlls/winnls32/winnls32.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/winscard/libwinscard.def --export ./dlls/winscard/winscard.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/winspool.drv/libwinspool.def --export ./dlls/winspool.drv/winspool.drv.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/wintab32/libwintab32.def --export ./dlls/wintab32/wintab32.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/wintrust/libwintrust.def --export ./dlls/wintrust/wintrust.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/wldap32/libwldap32.def --export ./dlls/wldap32/wldap32.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/wnaspi32/libwnaspi32.def --export ./dlls/wnaspi32/wnaspi32.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/wow32/libwow32.def --export ./dlls/wow32/wow32.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/ws2_32/libws2_32.def --export ./dlls/ws2_32/ws2_32.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/wsock32/libwsock32.def --export ./dlls/wsock32/wsock32.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/wtsapi32/libwtsapi32.def --export ./dlls/wtsapi32/wtsapi32.spec
./tools/winebuild/winebuild -m32 -w --def -o dlls/xinput1_3/libxinput.def --export ./dlls/xinput1_3/xinput1_3.spec
make[1]: Nothing to be done for `all'.
make[1]: Nothing to be done for `all'.
make[1]: Nothing to be done for `all'.
make[1]: Nothing to be done for `all'.
make[1]: Nothing to be done for `all'.
../../../tools/winegcc/winegcc -m32 -B../../../tools/winebuild --sysroot=../../.. -s -Wb,-F,advapi32_test.exe cred.o crypt.o crypt_lmhash.o crypt_md4.o crypt_md5.o crypt_sha.o eventlog.o lsa.o registry.o security.o service.o testlist.o -o advapi32_test-stripped.exe.so ../../../libs/port/libwine_port.a -lole32 -ladvapi32
/usr/libexec/gcc/i686-apple-darwin8/4.0.1/ld: can't use -s with -bundle (file must contain at least global symbols, for maximum stripping use -x)
collect2: ld returned 1 exit status
winegcc: gcc failed
make[1]: *** [advapi32_test-stripped.exe.so] Error 2
make: *** [dlls/advapi32/tests] Error 2
Compilation failed, aborting install.
michael-riveras-computer:~/desktop/wine-1.3.29 michaelrivera$
