Re: patches to GNUstep makefiles for FreeBSD

[Ian Mondragon]

kim-

thank you *so* much for submitting these...they work for FreeBSD-4.3, also.

- ian mondragon

* Kim Shrier <kim@tinker.com> [05/04/01 21:31]:
> I have a few patches that I have worked out to enable core to build
> properly on FreeBSD 4.2. 
> 
> The first one modifies the compile-all script to use gmake instead of
> make if gmake exists since GNU make is installed as gmake.
> 
> The second patch fixes the library linking macros in make/target.make
> for FreeBSD ELF.
> 
> The third patch uncomments the ADDITIONAL_LIB_DIRS macro in
> gui/Source/GNUmakefile.preamble and sets it to /usr/local/lib.
> I did not make this change conditional on running on FreeBSD.
> Should it be?
> 
> These patches work against the core.20010504.tar.bz2 daily snapshot.
> 
> Let me know if you have any questions.
> 
> Thanks,
> Kim
> -- 
>  Kim Shrier - principal, Shrier and Deihl - mailto:kim@tinker.com
> Remote Unix Network Admin, Security, Internet Software Development
>   Tinker Internet Services - Superior FreeBSD-based Web Hosting
>                      http://www.tinker.com/
> --- core/compile-all.orig     Tue Jan 30 07:32:01 2001
> +++ core/compile-all  Fri May  4 16:40:37 2001
> @@ -26,26 +26,33 @@
>    prefix="/usr/GNUstep"
>  fi
>  
> +if gmake -v >/dev/NULL 2>&1
> +then
> +     MAKE=gmake
> +else
> +     MAKE=make
> +fi
> +
>  cd make
>  ./configure --prefix=$prefix
> -make
> -make install
> +$MAKE
> +$MAKE install
>  
>  . $prefix/System/Makefiles/GNUstep.sh
>  
>  cd ../base
>  ./configure --prefix=$prefix
> -make
> -make install
> +$MAKE
> +$MAKE install
>  
>  cd ../gui
>  ./configure --prefix=$prefix
> -make
> -make install
> +$MAKE
> +$MAKE install
>  
>  cd ../xgps
>  ./configure --prefix=$prefix
> -make
> -make install
> +$MAKE
> +$MAKE install
>  
>  

> --- core/make/target.make.orig        Thu May  3 21:31:23 2001
> +++ core/make/target.make     Fri May  4 13:19:23 2001
> @@ -552,13 +552,15 @@
>  ifneq ($(freebsdaout), yes)
>  HAVE_SHARED_LIBS     = yes
>  SHARED_LIB_LINK_CMD = \
> -     $(CC) -shared -Wl,-soname,$(VERSION_LIBRARY_FILE) \
> +     $(CC) -shared -Wl,-soname,$(SONAME_LIBRARY_FILE) \
>          -o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ \
>          $(LIBRARIES_DEPEND_UPON) \
>          $(SHARED_LD_POSTFLAGS);\
>       (cd $(GNUSTEP_OBJ_DIR); \
> -       rm -f $(LIBRARY_FILE); \
> -       $(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
> +          rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
> +          $(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
> +          $(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
> +     )
>  SHARED_FRAMEWORK_LINK_CMD = \
>       $(CC) -shared -Wl,-soname,$(VERSION_FRAMEWORK_LIBRARY_FILE) \
>          -o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
> @@ -568,6 +570,12 @@
>       (cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
>         rm -f $(FRAMEWORK_LIBRARY_FILE); \
>         $(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
> +AFTER_INSTALL_SHARED_LIB_COMMAND = \
> +     (cd $(LIBRARY_INSTALL_DIR); \
> +          rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
> +          $(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
> +          $(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
> +     )
>  OBJ_MERGE_CMD                = \
>       $(CC) -nostdlib -r -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
>  

> --- core/gui/Source/GNUmakefile.preamble.orig Fri Apr 13 15:04:04 2001
> +++ core/gui/Source/GNUmakefile.preamble      Fri May  4 14:54:17 2001
> @@ -74,7 +74,7 @@
>  # ADDITIONAL_LDFLAGS = 
>  
>  # Additional library directories the linker should search
> -# ADDITIONAL_LIB_DIRS = 
> +ADDITIONAL_LIB_DIRS = -L/usr/local/lib
>  
>  #
>  # Flags dealing with installing and uninstalling


-- 
@end

Ian Mondragon  - < copal @ dragonhelix . org >

< h t t p : // d r a g o n h e l i x . o r g >

<<< F r e e B S D -- O b j e c t i v e - C >>>