apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1078631 - in /apr/apr/trunk: dbd/NWGNUdbdfreetds dbd/NWGNUdbdmysql dbd/NWGNUdbdpgsql dbd/NWGNUdbdsqli2 dbd/NWGNUdbdsqli3 dbm/NWGNUdbmdb dbm/NWGNUdbmgdbm
Date Sun, 06 Mar 2011 23:36:15 GMT
Author: fuankg
Date: Sun Mar  6 23:36:14 2011
New Revision: 1078631

URL: http://svn.apache.org/viewvc?rev=1078631&view=rev
Log:
NetWare build overhaul in order to compile on Linux.

Fix for crappy linker which cant deal with absolute unix
paths for import files.

Modified:
    apr/apr/trunk/dbd/NWGNUdbdfreetds
    apr/apr/trunk/dbd/NWGNUdbdmysql
    apr/apr/trunk/dbd/NWGNUdbdpgsql
    apr/apr/trunk/dbd/NWGNUdbdsqli2
    apr/apr/trunk/dbd/NWGNUdbdsqli3
    apr/apr/trunk/dbm/NWGNUdbmdb
    apr/apr/trunk/dbm/NWGNUdbmgdbm

Modified: apr/apr/trunk/dbd/NWGNUdbdfreetds
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdfreetds?rev=1078631&r1=1078630&r2=1078631&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdfreetds (original)
+++ apr/apr/trunk/dbd/NWGNUdbdfreetds Sun Mar  6 23:36:14 2011
@@ -60,11 +60,9 @@ XDEFINES	+= \
 XLFLAGS		+= \
 			$(EOLIST)
 
-ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(FREETDSSDK)/lib \
 			$(EOLIST)
-endif
 
 #
 # These values will be appended to the correct variables based on the value of
@@ -244,7 +242,7 @@ FILES_nlm_Ximports = \
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(FREETDS_IMP) \
+	@$(notdir $(FREETDS_IMP)) \
 	$(EOLIST)
 endif
 

Modified: apr/apr/trunk/dbd/NWGNUdbdmysql
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdmysql?rev=1078631&r1=1078630&r2=1078631&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdmysql (original)
+++ apr/apr/trunk/dbd/NWGNUdbdmysql Sun Mar  6 23:36:14 2011
@@ -64,11 +64,9 @@ XDEFINES	+= \
 XLFLAGS		+= \
 			$(EOLIST)
 
-ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(MYSQLSDK)/lib \
 			$(EOLIST)
-endif
 
 #
 # These values will be appended to the correct variables based on the value of
@@ -248,7 +246,7 @@ FILES_nlm_Ximports = \
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(MYSQL_IMP) \
+	@$(notdir $(MYSQL_IMP)) \
 	$(EOLIST)
 endif
 

Modified: apr/apr/trunk/dbd/NWGNUdbdpgsql
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdpgsql?rev=1078631&r1=1078630&r2=1078631&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdpgsql (original)
+++ apr/apr/trunk/dbd/NWGNUdbdpgsql Sun Mar  6 23:36:14 2011
@@ -65,6 +65,10 @@ ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(PGSQLSDK)/lib \
 			$(EOLIST)
+else
+XLFLAGS		+= \
+			-l $(PGSQLSDK)/imp \
+			$(EOLIST)
 endif
 
 #
@@ -245,7 +249,7 @@ FILES_nlm_Ximports = \
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(PGSQL_IMP) \
+	@$(notdir $(PGSQL_IMP)) \
 	$(EOLIST)
 endif
 

Modified: apr/apr/trunk/dbd/NWGNUdbdsqli2
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdsqli2?rev=1078631&r1=1078630&r2=1078631&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdsqli2 (original)
+++ apr/apr/trunk/dbd/NWGNUdbdsqli2 Sun Mar  6 23:36:14 2011
@@ -60,11 +60,9 @@ XDEFINES	+= \
 XLFLAGS		+= \
 			$(EOLIST)
 
-ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(SQLITE2SDK) \
 			$(EOLIST)
-endif
 
 #
 # These values will be appended to the correct variables based on the value of
@@ -244,7 +242,7 @@ FILES_nlm_Ximports = \
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(SQLITE2_IMP) \
+	@$(notdir $(SQLITE2_IMP)) \
 	$(EOLIST)
 endif
 

Modified: apr/apr/trunk/dbd/NWGNUdbdsqli3
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdsqli3?rev=1078631&r1=1078630&r2=1078631&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdsqli3 (original)
+++ apr/apr/trunk/dbd/NWGNUdbdsqli3 Sun Mar  6 23:36:14 2011
@@ -60,11 +60,9 @@ XDEFINES	+= \
 XLFLAGS		+= \
 			$(EOLIST)
 
-ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(SQLITE3SDK) \
 			$(EOLIST)
-endif
 
 #
 # These values will be appended to the correct variables based on the value of
@@ -246,7 +244,7 @@ FILES_nlm_Ximports = \
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(SQLITE3_IMP) \
+	@$(notdir $(SQLITE3_IMP)) \
 	$(EOLIST)
 endif
 

Modified: apr/apr/trunk/dbm/NWGNUdbmdb
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbm/NWGNUdbmdb?rev=1078631&r1=1078630&r2=1078631&view=diff
==============================================================================
--- apr/apr/trunk/dbm/NWGNUdbmdb (original)
+++ apr/apr/trunk/dbm/NWGNUdbmdb Sun Mar  6 23:36:14 2011
@@ -67,6 +67,10 @@ ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(DBSDK)/lib \
 			$(EOLIST)
+else
+XLFLAGS		+= \
+			-l $(DBSDK)/imp \
+			$(EOLIST)
 endif
 
 #
@@ -247,7 +251,7 @@ FILES_nlm_Ximports = \
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(DB_IMP) \
+	@$(notdir $(DB_IMP)) \
 	$(EOLIST)
 endif
 

Modified: apr/apr/trunk/dbm/NWGNUdbmgdbm
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbm/NWGNUdbmgdbm?rev=1078631&r1=1078630&r2=1078631&view=diff
==============================================================================
--- apr/apr/trunk/dbm/NWGNUdbmgdbm (original)
+++ apr/apr/trunk/dbm/NWGNUdbmgdbm Sun Mar  6 23:36:14 2011
@@ -66,6 +66,10 @@ ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(GDBMSDK)/lib \
 			$(EOLIST)
+else
+XLFLAGS		+= \
+			-l $(GDBMSDK)/imp \
+			$(EOLIST)
 endif
 
 #
@@ -246,7 +250,7 @@ FILES_nlm_Ximports = \
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(GDBM_IMP) \
+	@$(notdir $(GDBM_IMP)) \
 	$(EOLIST)
 endif
 



Mime
View raw message