[Bug 16922] New: Build broken on NetBSD

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

Summary: Build broken on NetBSD
           Product: Wine
           Version: 1.1.12
          Platform: PC
        OS/Version: NetBSD
            Status: NEW
          Severity: blocker
          Priority: P2
         Component: build-env
        AssignedTo: [e-mail]
        ReportedBy: [e-mail]

Created an attachment (id=18686)
 --> (http://bugs.winehq.org/attachment.cgi?id=18686)
config.log

`makedep' is up to date.
(GIT_DIR=../../.git git describe HEAD 2>/dev/null || echo "wine-1.1.12") | sed
-n -e '$s/(.*)/const char wine_build[] = "\1";/p' >version-stamp || (rm -f
version-stamp && exit 1)
../../tools/winebuild/winebuild --target  -w --def -o libd3dx9.def --export
./d3dx9_36.spec
winebuild: Unrecognized CPU ''
*** Error code 1

Build command used was:
CC="ccache gcc" \
CFLAGS="-O2 -I/usr/pkg/include -I/usr/include -I/usr/pkg/include/freetype2
-I/usr/X11R6/include" \
CPPFLAGS="-I/usr/pkg/include -I/usr/include -I/usr/pkg/include/freetype2
-I/usr/X11R6/include" \
LDFLAGS="-L/usr/pkg/lib -Wl,-R/usr/pkg/lib -L/usr/lib -Wl,-R/usr/lib
-L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib" \
./configure --disable-tests &&
make depend &&
make &&
exit

Attaching config.log/config.status

[Bug 16922] Build broken on NetBSD

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

--- Comment #1 from Austin English   2009-01-13 18:57:20 ---
Created an attachment (id=18687)
 --> (http://bugs.winehq.org/attachment.cgi?id=18687)
config.status

[Bug 16922] Build broken on NetBSD

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

Austin English  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
           Keywords|                            |regression, source

--- Comment #2 from Austin English   2009-01-13 20:58:35 ---
The current version in port is 1.0.1, which I just tested in git, and builds
fine (err, at least, past that point). I just started the regression test, but
as a first guess, looks like fa616418add27e0036ff2e762fa7b6b5e161a7b6 may be to
blame.

http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa616418add27e0036ff2e...

[Bug 16922] Build broken on NetBSD

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

Austin English  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]
           Keywords|                            |patch

--- Comment #3 from Austin English   2009-01-13 23:29:54 ---
424cb27e6afb2b346186bfe8c9ba836c8bb611a2 is first bad commit
commit 424cb27e6afb2b346186bfe8c9ba836c8bb611a2
Author: Alexandre Julliard 
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...

[Bug 16922] Build broken on NetBSD

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

Austin English  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED

--- Comment #4 from Austin English   2009-01-14 11:47:57 ---
Fixed by h=8c84636cd5a007d3f511809849a48ca27b0277bb. Thanks for the quick fix
Alexandre!

[Bug 16922] Build broken on NetBSD

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

Alexandre Julliard  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |CLOSED

--- Comment #5 from Alexandre Julliard   2009-01-16 10:39:54 ---
Closing bugs fixed in 1.1.13.