From 0d7c2153a9a6d092eb91950f9225d7c51529ccce Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Mon, 10 Aug 2009 09:48:16 +0000 Subject: [PATCH] 2009-08-10 11:48 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/config/linux/sunpro.cf ! fixed list of linked system libraries to be Linux compatible --- harbour/ChangeLog | 4 ++++ harbour/config/linux/sunpro.cf | 13 ++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 495dea4bf7..9acf0d1bd8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,10 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-10 11:48 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/config/linux/sunpro.cf + ! fixed list of linked system libraries to be Linux compatible + 2009-08-10 11:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbtip/sendmail.prg * contrib/hbtip/client.prg diff --git a/harbour/config/linux/sunpro.cf b/harbour/config/linux/sunpro.cf index 654ab0aff3..e778119165 100644 --- a/harbour/config/linux/sunpro.cf +++ b/harbour/config/linux/sunpro.cf @@ -69,7 +69,7 @@ LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lhbrtl # screen driver libraries ifeq ($(HB_CRS_LIB),) -HB_CRS_LIB := curses +HB_CRS_LIB := ncurses endif ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),) LINKLIBS += -l$(HB_CRS_LIB) @@ -82,13 +82,13 @@ LINKLIBS += -lX11 LINKPATHS += -L/usr/X11R6/lib endif -endif - # HB_GPM_MOUSE: use gpm mouse driver ifeq ($(HB_GPM_MOUSE),yes) LINKLIBS += -lgpm endif +endif + ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),) LINKLIBS += -lpcre endif @@ -97,13 +97,12 @@ ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),) LINKLIBS += -lz endif -LINKLIBS += -lm -lrt -LINKLIBS += -lnsl -lresolv +LINKLIBS += -lm -lrt -ldl LDFLAGS += $(LINKPATHS) -AR := ar +AR := $(HB_CCPREFIX)ar ARFLAGS = $(HB_USER_AFLAGS) -AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) +AR_RULE = $(AR) $(ARFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) include $(TOP)$(ROOT)config/rules.cf