Build farm patch Samba 3, OpenBSD 3.7, Makefile.in

[Steve Williams]

Hi,

On my OpenBSD 3.7 (i386) system in the build farm, I am getting the 
following error:
$ make
Using FLAGS =  -Wall -D_SAMBA_BUILD_  -Iinclude 
-I/home/build/build_farm/samba_3
/local/include -I/home/build/build_farm/samba_3_0/source 
-I/home/build/build_far
      LIBS = -lresolv -liconv
      LDSHFLAGS = -shared  -L/usr/local/lib
      LDFLAGS = -L/usr/local/lib
      PIE_CFLAGS =
      PIE_LDFLAGS =
WARNING: you need to rerun ./autogen.sh
Linking bin/tdbbackup
/usr/bin/ld: cannot find -liconv
collect2: ld returned 1 exit status
*** Error code 1

Stop in /home/build/build_farm/samba_3_0/source (line 1316 of Makefile).

On OpenBSD the "iconv" library is a package, and is installed in 
/usr/local/lib.

Checking the makefile,  $(LIBS) is included, but not $(LDFLAGS) to get 
find the iconv library in  "-L/usr/local/lib"

I'm not sure if this is the correct patch, but it compiles fine.  It 
just adds the $(LDFLAGS).

--- source/Makefile.in.org      Sat Sep 10 08:10:23 2005
+++ source/Makefile.in  Sat Sep 10 16:39:07 2005
@@ -1314,15 +1314,15 @@

 bin/tdbbackup at EXEEXT@: $(TDBBACKUP_OBJ) bin/.dummy
        @echo Linking $@
-       @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) 
$(TDBBACKUP_OBJ) @SOCKWRAP@
+       @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(TDBBACKUP_OBJ) @SOCKWRAP@

 bin/tdbtool at EXEEXT@: $(TDBTOOL_OBJ) bin/.dummy
        @echo Linking $@
-       @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) 
$(TDBTOOL_OBJ) @SOCKWRAP@
+       @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(TDBTOOL_OBJ) @SOCKWRAP@

 bin/tdbdump at EXEEXT@: $(TDBDUMP_OBJ) bin/.dummy
        @echo Linking $@
-       @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) 
$(TDBDUMP_OBJ) @SOCKWRAP@
+       @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(TDBDUMP_OBJ) @SOCKWRAP@

 bin/t_strcmp at EXEEXT@: bin/libbigballofmud. at SHLIBEXT@ torture/t_strcmp.o
        $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) 
torture/t_strcmp.o -L ./bin -lbigballofmud

--- source/Makefile.in.org      Sat Sep 10 08:10:23 2005
+++ source/Makefile.in  Sat Sep 10 16:39:07 2005
@@ -1314,15 +1314,15 @@

 bin/tdbbackup at EXEEXT@: $(TDBBACKUP_OBJ) bin/.dummy
        @echo Linking $@
-       @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) 
$(TDBBACKUP_OBJ) @SOCKWRAP@
+       @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(TDBBACKUP_OBJ) @SOCKWRAP@

 bin/tdbtool at EXEEXT@: $(TDBTOOL_OBJ) bin/.dummy
        @echo Linking $@
-       @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) 
$(TDBTOOL_OBJ) @SOCKWRAP@
+       @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(TDBTOOL_OBJ) @SOCKWRAP@

 bin/tdbdump at EXEEXT@: $(TDBDUMP_OBJ) bin/.dummy
        @echo Linking $@
-       @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) 
$(TDBDUMP_OBJ) @SOCKWRAP@
+       @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(TDBDUMP_OBJ) @SOCKWRAP@

 bin/t_strcmp at EXEEXT@: bin/libbigballofmud. at SHLIBEXT@ torture/t_strcmp.o
        $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) 
torture/t_strcmp.o -L ./bin -lbigballofmud