From c890f8ec8eae040d88cff49a6746f59928da977e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 26 Aug 2009 23:41:27 +0000 Subject: [PATCH] 2009-08-27 01:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/bsd/gcc.mk * config/darwin/gcc.mk * config/darwin/icc.mk * config/hpux/gcc.mk * config/linux/gcc.mk * config/linux/icc.mk * config/linux/sunpro.mk * config/sunos/gcc.mk * config/sunos/sunpro.mk + Added system lib paths to DFLAGS. This caused dynlib link error with X11 lib on Darwin. --- harbour/ChangeLog | 13 +++++++++++++ harbour/config/bsd/gcc.mk | 2 +- harbour/config/darwin/gcc.mk | 2 +- harbour/config/darwin/icc.mk | 2 +- harbour/config/hpux/gcc.mk | 2 +- harbour/config/linux/gcc.mk | 2 +- harbour/config/linux/icc.mk | 2 +- harbour/config/linux/sunpro.mk | 2 +- harbour/config/sunos/gcc.mk | 2 +- harbour/config/sunos/sunpro.mk | 2 +- 10 files changed, 22 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bd122ac1b6..9ea9591a4d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,19 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-27 01:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/bsd/gcc.mk + * config/darwin/gcc.mk + * config/darwin/icc.mk + * config/hpux/gcc.mk + * config/linux/gcc.mk + * config/linux/icc.mk + * config/linux/sunpro.mk + * config/sunos/gcc.mk + * config/sunos/sunpro.mk + + Added system lib paths to DFLAGS. This caused dynlib link + error with X11 lib on Darwin. + 2009-08-26 19:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/lib.mk + Added hack to make hbpp hack (in source/pp/Makefile) happy. diff --git a/harbour/config/bsd/gcc.mk b/harbour/config/bsd/gcc.mk index 3eb12cbfbd..61a6b15ebb 100644 --- a/harbour/config/bsd/gcc.mk +++ b/harbour/config/bsd/gcc.mk @@ -45,7 +45,7 @@ ARFLAGS := AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ DY := $(CC) -DFLAGS := -shared -fPIC +DFLAGS := -shared -fPIC $(foreach dir,$(SYSLIBPATHS),-L$(dir)) DY_OUT := -o$(subst x,x, ) DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib)) diff --git a/harbour/config/darwin/gcc.mk b/harbour/config/darwin/gcc.mk index cc7825ff02..4fd7bb3ab5 100644 --- a/harbour/config/darwin/gcc.mk +++ b/harbour/config/darwin/gcc.mk @@ -58,7 +58,7 @@ ARFLAGS := AR_RULE = $(AR) -static $(ARFLAGS) $(HB_USER_AFLAGS) -o $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(AR) -DFLAGS := -dynamic -flat_namespace -undefined warning -multiply_defined suppress -single_module +DFLAGS := -dynamic -flat_namespace -undefined warning -multiply_defined suppress -single_module $(foreach dir,$(SYSLIBPATHS),-L$(dir)) DY_OUT := -o$(subst x,x, ) DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib)) diff --git a/harbour/config/darwin/icc.mk b/harbour/config/darwin/icc.mk index 037f0c8005..d00d1be005 100644 --- a/harbour/config/darwin/icc.mk +++ b/harbour/config/darwin/icc.mk @@ -51,7 +51,7 @@ ARFLAGS := AR_RULE = $(AR) -static $(ARFLAGS) $(HB_USER_AFLAGS) -o $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(AR) -DFLAGS := -dynamic -flat_namespace -undefined warning -multiply_defined suppress -single_module +DFLAGS := -dynamic -flat_namespace -undefined warning -multiply_defined suppress -single_module $(foreach dir,$(SYSLIBPATHS),-L$(dir)) DY_OUT := -o$(subst x,x, ) DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib)) diff --git a/harbour/config/hpux/gcc.mk b/harbour/config/hpux/gcc.mk index a7a0e1a8f7..277672818f 100644 --- a/harbour/config/hpux/gcc.mk +++ b/harbour/config/hpux/gcc.mk @@ -51,7 +51,7 @@ ARFLAGS := AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(CC) -DFLAGS := -shared -fPIC +DFLAGS := -shared -fPIC $(foreach dir,$(SYSLIBPATHS),-L$(dir)) DY_OUT := -o$(subst x,x, ) DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib)) diff --git a/harbour/config/linux/gcc.mk b/harbour/config/linux/gcc.mk index 64d4b52fd1..d21ffc2694 100644 --- a/harbour/config/linux/gcc.mk +++ b/harbour/config/linux/gcc.mk @@ -49,7 +49,7 @@ ARFLAGS := AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(CC) -DFLAGS := -shared -fPIC +DFLAGS := -shared -fPIC $(foreach dir,$(SYSLIBPATHS),-L$(dir)) DY_OUT := -o$(subst x,x, ) DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib)) diff --git a/harbour/config/linux/icc.mk b/harbour/config/linux/icc.mk index b2d3cf539a..3108e2fe80 100644 --- a/harbour/config/linux/icc.mk +++ b/harbour/config/linux/icc.mk @@ -54,7 +54,7 @@ ARFLAGS := AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(CC) -DFLAGS := -shared -fPIC +DFLAGS := -shared -fPIC $(foreach dir,$(SYSLIBPATHS),-L$(dir)) DY_OUT := -o$(subst x,x, ) DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib)) diff --git a/harbour/config/linux/sunpro.mk b/harbour/config/linux/sunpro.mk index 0f33460baa..76db777173 100644 --- a/harbour/config/linux/sunpro.mk +++ b/harbour/config/linux/sunpro.mk @@ -72,7 +72,7 @@ ARFLAGS := AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(CC) -DFLAGS := -G -KPIC $(HB_ISAOPT) +DFLAGS := -G -KPIC $(HB_ISAOPT) $(foreach dir,$(SYSLIBPATHS),-L$(dir)) ifneq ($(HB_BUILD_OPTIM),no) DFLAGS += -fast -xnolibmopt endif diff --git a/harbour/config/sunos/gcc.mk b/harbour/config/sunos/gcc.mk index 42b54f8c01..689fd83377 100644 --- a/harbour/config/sunos/gcc.mk +++ b/harbour/config/sunos/gcc.mk @@ -49,7 +49,7 @@ ARFLAGS := AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(CC) -DFLAGS := -shared -fPIC +DFLAGS := -shared -fPIC $(foreach dir,$(SYSLIBPATHS),-L$(dir)) DY_OUT := -o$(subst x,x, ) DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib)) diff --git a/harbour/config/sunos/sunpro.mk b/harbour/config/sunos/sunpro.mk index 1d47cf80ea..23130bdf64 100644 --- a/harbour/config/sunos/sunpro.mk +++ b/harbour/config/sunos/sunpro.mk @@ -78,7 +78,7 @@ ARFLAGS := AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(CC) -DFLAGS := -G $(HB_ISAOPT) +DFLAGS := -G $(HB_ISAOPT) $(foreach dir,$(SYSLIBPATHS),-L$(dir)) ifneq ($(HB_BUILD_OPTIM),no) DFLAGS += -fast -xnolibmopt endif