From afa2aadf0ff509e47dc53fd0e6e41ade364c3364 Mon Sep 17 00:00:00 2001
From: bellardo <bellardo@users.sourceforge.net>
Date: Wed, 17 Oct 2001 22:48:01 +0000
Subject: [PATCH] Changes to make FB2 compile on Darwin.  Mostly build system
 related, but also added a missing typecast in isql.epp.

---
 src/isql/isql.epp               |  4 ++--
 src/make.new/Makefile.in.extlib |  6 +++---
 src/make.new/Makefile.in.intl   |  4 ++--
 src/make.new/make.rules         | 10 +++++-----
 src/make.new/prefix.darwin      | 14 +++++++++-----
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/isql/isql.epp b/src/isql/isql.epp
index a681a89e9a..7e5ad91e34 100644
--- a/src/isql/isql.epp
+++ b/src/isql/isql.epp
@@ -21,7 +21,7 @@
  * Contributor(s): ______________________________________.
  */
 /*
-  $Id: isql.epp,v 1.4 2001-10-17 21:53:38 bellardo Exp $
+  $Id: isql.epp,v 1.5 2001-10-17 22:48:01 bellardo Exp $
   Revision 1.5  2000/11/18 16:49:24  fsg
   Increased PRINT_BUFFER_LENGTH to 2048 to show larger plans
   Fixed Bug #122563 in extract.e get_procedure_args
@@ -663,7 +663,7 @@ static void readNextInputLine(const char* prompt) {
     //   (need to check if lineSize or lineSize +1 - I hate C and don't remember it exactly
     //   I've left it here as a guide.
 
-    lastInputLine = malloc(BUFFER_LENGTH512);
+    lastInputLine = (char*)malloc(BUFFER_LENGTH512);
     if (!ib_fgets(lastInputLine, BUFFER_LENGTH512, ib_stdin)) {
         free(lastInputLine);
         lastInputLine = NULL;
diff --git a/src/make.new/Makefile.in.extlib b/src/make.new/Makefile.in.extlib
index b5e02bdc0f..435fbf669e 100644
--- a/src/make.new/Makefile.in.extlib
+++ b/src/make.new/Makefile.in.extlib
@@ -26,7 +26,7 @@
 #   Contributor(s):
 # 
 # 
-#   $Id: Makefile.in.extlib,v 1.2 2001-08-13 08:14:38 skywalker Exp $
+#   $Id: Makefile.in.extlib,v 1.3 2001-10-17 22:48:01 bellardo Exp $
 # 
 
 ROOT=../..
@@ -55,7 +55,7 @@ UDF_OBJECTS = ib_udf.o
 lib_ib_udf: $(UDF)/ib_udf.so($(UDF_OBJECTS))
 
 $(UDF)/ib_udf.so(%.o) : %.o
-	ar crsv $@  $%
+	ar crv $@  $%
 
 
 # ib_util
@@ -65,7 +65,7 @@ UTIL_OBJECTS = ib_util.o
 lib_ib_util: $(LIB)/ib_util.so($(UDF_OBJECTS))
 
 $(LIB)/ib_util.so(%.o) : %.o
-	ar crsv $@  $%
+	ar crv $@  $%
 
 
 .c.o:
diff --git a/src/make.new/Makefile.in.intl b/src/make.new/Makefile.in.intl
index 362f52e249..cd007a0127 100644
--- a/src/make.new/Makefile.in.intl
+++ b/src/make.new/Makefile.in.intl
@@ -26,7 +26,7 @@
 #   Contributor(s):
 # 
 # 
-#   $Id: Makefile.in.intl,v 1.4 2001-08-13 08:14:38 skywalker Exp $
+#   $Id: Makefile.in.intl,v 1.5 2001-10-17 22:48:01 bellardo Exp $
 # 
 
 ROOT=../..
@@ -68,7 +68,7 @@ INTL_DIR = $(FIREBIRD)/intl
 intl: $(LIBGDSINTL_LA)
 
 $(LIBGDSINTL_LA) : $(INTL_Objects1)
-	$(LIB_LINK)  $(LIB_LINK_OPTIONS) -o$(LIBGDSINTL_LA) $^
+	$(LIB_LINK)  $(LIB_LINK_OPTIONS) -o $(LIBGDSINTL_LA) $^
 
 
 # In the original there was a few quite involved things being done to make
diff --git a/src/make.new/make.rules b/src/make.new/make.rules
index 523824da15..e4695833d2 100644
--- a/src/make.new/make.rules
+++ b/src/make.new/make.rules
@@ -26,7 +26,7 @@
 #   Contributor(s):
 # 
 # 
-#   $Id: make.rules,v 1.10 2001-08-27 15:29:18 skywalker Exp $
+#   $Id: make.rules,v 1.11 2001-10-17 22:48:01 bellardo Exp $
 # 
 
 #____________________________________________________________________________
@@ -125,10 +125,10 @@ else
 #    LIB_LINK_OPTIONS = -soname libgds.so.2 -rpath /usr/lib
     LIB_LINK_OPTIONS =
 
-    EXE_LINK = g++
-    STATICEXE_LINK = g++
-#    EXE_LINK = @CXX@
-#    STATICEXE_LINK = @CXX@
+#    EXE_LINK = g++
+#    STATICEXE_LINK = g++
+    EXE_LINK = @CXX@
+    STATICEXE_LINK = @CXX@
 endif
 
 
diff --git a/src/make.new/prefix.darwin b/src/make.new/prefix.darwin
index 4aa6e52b7f..00a97179f1 100644
--- a/src/make.new/prefix.darwin
+++ b/src/make.new/prefix.darwin
@@ -15,7 +15,7 @@
 # All Rights Reserved.
 # Contributor(s): ______________________________________.
 # Start of file prefix.darwin:	$(VERSION)	@PLATFORM@
-#$Id: prefix.darwin,v 1.4 2001-08-07 02:15:26 bellardo Exp $
+#$Id: prefix.darwin,v 1.5 2001-10-17 22:48:01 bellardo Exp $
 
 
 #_____________________________________________________________________________
@@ -178,11 +178,15 @@ DARWIN_FOUNDATION_LINK=	-framework Foundation
 
 # Options for linking the FB shared library.
 LIBGDS_SO := $(LIB)/libgds.dylib
-LIB_LINK := libtool -dynamic \
-		-install_name $(FW_NAME)/Versions/A/$(FBFW_PREFIX) \
+LIB_LINK := libtool
+LIBGDS_LINK_OPTIONS := -dynamic -install_name \
+		$(FW_NAME)/Versions/A/$(FBFW_PREFIX) \
 		-current_version $(FW_VERS) \
-		-compatibility_version $(FW_COMPAT_VERS)
-LIB_LINK_OPTIONS := -framework System -framework CoreFoundation -lstdc++ -lcc_dynamic
+		-compatibility_version $(FW_COMPAT_VERS) \
+		-framework System -framework CoreFoundation \
+		-lstdc++ -lcc_dynamic
+
+LIB_LINK_OPTIONS := -dynamic
 
 # The routines used for IO.  Darwin uses the unix routines.
 IO_Sources=             unix.cpp