fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-08-20 01:22 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/config/bsd/gcc.mk
  * harbour/config/bin.mk
  * harbour/config/hpux/gcc.mk
  * harbour/config/darwin/gcc.mk
  * harbour/config/linux/gcc.mk
  * harbour/config/linux/icc.mk
  * harbour/config/linux/global.mk
  * harbour/config/linux/sunpro.mk
  * harbour/config/rules.mk
  * harbour/config/os2/gcc.mk
  * harbour/config/sunos/gcc.mk
  * harbour/config/sunos/sunpro.mk
    ! replaced wrongly used 'findstring' functions with 'filter' functions

  * harbour/config/linux/global.mk
    * enable -fPIC for all non x86@32 GCC and ICC Linux builds
This commit is contained in:
Przemyslaw Czerpak
2009-08-19 23:23:25 +00:00
parent 8bd403daa5
commit 2adb22e920
13 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
harbour/ChangeLog
View File

@@ -17,6 +17,24 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-20 01:22 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/config/bsd/gcc.mk
* harbour/config/bin.mk
* harbour/config/hpux/gcc.mk
* harbour/config/darwin/gcc.mk
* harbour/config/linux/gcc.mk
* harbour/config/linux/icc.mk
* harbour/config/linux/global.mk
* harbour/config/linux/sunpro.mk
* harbour/config/rules.mk
* harbour/config/os2/gcc.mk
* harbour/config/sunos/gcc.mk
* harbour/config/sunos/sunpro.mk
! replaced wrongly used 'findstring' functions with 'filter' functions
* harbour/config/linux/global.mk
* enable -fPIC for all non x86@32 GCC and ICC Linux builds
2009-08-20 00:52 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/config/global.mk
! fixed typo in platform detection 'ifeq' instead of 'ifneq' and 'win'

6
harbour/config/bin.mk
View File

@@ -26,12 +26,12 @@ HB_LIBS_TPL = \
hbpp \
hbcommon
ifeq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
ifeq ($(findstring -DHB_POSIX_REGEX, $(HB_USER_CFLAGS)),)
ifeq ($(filter -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
ifeq ($(filter -DHB_POSIX_REGEX, $(HB_USER_CFLAGS)),)
HB_LIBS_TPL += hbpcre
endif
endif
ifeq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
ifeq ($(filter -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
HB_LIBS_TPL += hbzlib
endif

4
harbour/config/bsd/gcc.mk
View File

@@ -61,11 +61,11 @@ ifneq ($(findstring hbrtl, $(LIBS)),)
LIBPATHS += -L/usr/local/lib
ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
ifneq ($(filter -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
LDLIBS += -lpcre
endif
ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
ifneq ($(filter -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
LDLIBS += -lz
endif
endif

4
harbour/config/darwin/gcc.mk
View File

@@ -72,11 +72,11 @@ ifneq ($(findstring hbrtl, $(LIBS)),)
LIBPATHS += -L/usr/X11R6/lib
endif
ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
ifneq ($(filter -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
LDLIBS += -lpcre
endif
ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
ifneq ($(filter -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
LDLIBS += -lz
endif
endif

4
harbour/config/hpux/gcc.mk
View File

@@ -61,11 +61,11 @@ ifneq ($(findstring hbrtl, $(LIBS)),)
LIBPATHS += -L/usr/X11R6/lib
endif
ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
ifneq ($(filter -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
LDLIBS += -lpcre
endif
ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
ifneq ($(filter -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
LDLIBS += -lz
endif

4
harbour/config/linux/gcc.mk
View File

@@ -64,11 +64,11 @@ ifneq ($(findstring hbrtl, $(LIBS)),)
LDLIBS += -lgpm
endif
ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
ifneq ($(filter -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
LDLIBS += -lpcre
endif
ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
ifneq ($(filter -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
LDLIBS += -lz
endif

20
harbour/config/linux/global.mk
View File

@@ -9,14 +9,18 @@ BIN_EXT :=
HB_GT_LIBS += gttrm
ifeq ($(HB_SHELL),sh)
ifneq ($(HB_COMPILER),sunpro)
ifeq ($(findstring -fPIC,$(HB_USER_CFLAGS)),)
_UNAME_M := $(shell uname -m)
# TODO: Make this complete:
# || ( $( "*[ix]*86" ) && $( "*[ix]*86[^0-9]*" ) )
ifneq ($(findstring $(_UNAME_M),@64 _64 x86_64),)
HB_CFLAGS += -fPIC
endif
ifneq ($(filter $(HB_COMPILER),gcc icc),)
ifeq ($(filter -fPIC,$(HB_USER_CFLAGS)),)
ifeq ($(filter -fpic,$(HB_USER_CFLAGS)),)
_UNAME_M := $(shell uname -m)
ifeq ($(findstring 86,$(_UNAME_M)),)
HB_CFLAGS += -fPIC
else
ifneq ($(findstring 64,$(_UNAME_M)),)
HB_CFLAGS += -fPIC
endif
endif
endif
endif
endif
endif

4
harbour/config/linux/icc.mk
View File

@@ -69,11 +69,11 @@ ifneq ($(findstring hbrtl, $(LIBS)),)
LDLIBS += -lgpm
endif
ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
ifneq ($(filter -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
LDLIBS += -lpcre
endif
ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
ifneq ($(filter -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
LDLIBS += -lz
endif

4
harbour/config/linux/sunpro.mk
View File

@@ -86,11 +86,11 @@ ifneq ($(findstring hbrtl, $(LIBS)),)
LDLIBS += -lgpm
endif
ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
ifneq ($(filter -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
LDLIBS += -lpcre
endif
ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
ifneq ($(filter -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
LDLIBS += -lz
endif

2
harbour/config/os2/gcc.mk
View File

@@ -48,7 +48,7 @@ LDLIBS := $(foreach lib,$(LIBS),-l$(lib))
# Add the specified GT driver library
ifneq ($(findstring hbrtl, $(LIBS)),)
ifeq ($(C_MAIN),)
ifeq ($(findstring os2pm,$(HB_GT_LIB)),os2pm)
ifeq ($(filter os2pm,$(HB_GT_LIB)),os2pm)
# Special handling for PM mode
LDLIBS += -l$(HB_GT_LIB)
LDLIBS += -lgtos2

2
harbour/config/rules.mk
View File

@@ -33,7 +33,7 @@ ifeq ($(CC_RULE),)
ifneq ($(HB_BUILD_DLL),no)
ifneq ($(HB_DYN_COPT),)
ifneq ($(LIBNAME),)
ifneq ($(findstring $(LIBNAME),$(HB_DYN_LIBS)),)
ifneq ($(filter $(LIBNAME),$(HB_DYN_LIBS)),)
define cc_comp_all
$(CC) $(HB_INC_DEPEND) $(CPPFLAGS) $(CFLAGS) $(HB_CFLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN) $<
$(CC) $(HB_INC_DEPEND) $(CPPFLAGS) $(CFLAGS) $(HB_CFLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=_dyn$(OBJ_EXT)) $(HB_DYN_COPT) $(CC_IN) $<

4
harbour/config/sunos/gcc.mk
View File

@@ -59,11 +59,11 @@ ifneq ($(findstring hbrtl, $(LIBS)),)
LIBPATHS += -L/usr/X11R6/lib
endif
ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
ifneq ($(filter -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
LDLIBS += -lpcre
endif
ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
ifneq ($(filter -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
LDLIBS += -lz
endif

4
harbour/config/sunos/sunpro.mk
View File

@@ -87,11 +87,11 @@ ifneq ($(findstring hbrtl, $(LIBS)),)
LIBPATHS += -L/usr/X11R6/lib
endif
ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
ifneq ($(filter -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
LDLIBS += -lpcre
endif
ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
ifneq ($(filter -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
LDLIBS += -lz
endif