[Bug 16922] Build broken on NetBSD

[wine-bugs at winehq.org]

http://bugs.winehq.org/show_bug.cgi?id=16922


Austin English <austinenglish at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |julliard at winehq.org
           Keywords|                            |patch




--- Comment #3 from Austin English <austinenglish at gmail.com>  2009-01-13 23:29:54 ---
424cb27e6afb2b346186bfe8c9ba836c8bb611a2 is first bad commit
commit 424cb27e6afb2b346186bfe8c9ba836c8bb611a2
Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Dec 26 17:54:50 2008 +0100

    configure: When cross-compiling, propagate the target specification to
winebuild.

:100644 100644 d49d2a36446f0585f616d52058d5fa793f565eac
0c86aa16f10d3fcfe58e950e5cac1eb97e7411dd M      Make.rules.in
:100755 100755 ac42b9fef3deeb7255fdb105480de3806efb0b10
8019c1a3eacb4dfd7f57075cf9b3f8986ccb9b38 M      configure
:100644 100644 a84c82283fa3ae25101c1740f3b1c21c7e7955b5
a266e53ae91a5629da80f0e6a483e0809af7a8dd M      configure.ac
:040000 040000 dba3554107cf7ca20c0399e23ab92dd048c199e4
3fac09c6048600ba0d337bbff8fb1f124a8b9690 M      dlls

Seems I was wrong :-)

Below patch fixes it for me:
diff --git a/Make.rules.in b/Make.rules.in
index 0c86aa1..5bf37aa 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -62,7 +62,7 @@ EXTRACFLAGS  = @EXTRACFLAGS@
 ALLCFLAGS    = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS)
$(CFLAGS) $(MODCFLAGS)
 ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
 IDLFLAGS     = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)
-WINEBUILDFLAGS = $(DLLFLAGS) $(TARGET:%=--target %) --as-cmd "$(AS)"
+WINEBUILDFLAGS = $(DLLFLAGS) --as-cmd "$(AS)"
 MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755
 WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check
 WINEWRAPPER  = $(TOPSRCDIR)/tools/winewrapper
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index b043f9e..c916966 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -48,7 +48,7 @@ all implib: $(IMPORTLIBFILE)
$(IMPLIB_SRCS:%=__static_implib__%)
 $(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB)

 $(SPEC_DEF) $(IMPORTLIB:%=lib%.def): $(MAINSPEC)
-       $(WINEBUILD) $(TARGET:%=--target %) -w --def -o $@ --export
$(SRCDIR)/$(MAINSPEC)
+       $(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)

 $(IMPORTLIB:%=lib%.def.a): $(IMPLIB_OBJS)
        $(RM) $@

Seems for some reason on NetBSD it's always sending --target '', even if not
cross compiling...


-- 
Configure bugmail: http://bugs.winehq.org/userprefs.cgi?tab=email
Do not reply to this email, post in Bugzilla using the
above URL to reply.
------- You are receiving this mail because: -------
You are watching all bug changes.