ivtools-2.0.11b -- another attempt at homebrew build

vectaport · Jan 2, 2022 · b3b3f97 · b3b3f97
1 parent 066225a
commit b3b3f97
Show file tree

Hide file tree

Showing 21 changed files with 58 additions and 12 deletions.
diff --git a/CHANGES/CHANGES-2.0 b/CHANGES/CHANGES-2.0
@@ -1,4 +1,13 @@
-December 31st 2021 ivtools-2.0.10
+January 2nd, 2022 ivtools-2.0.11b
+
+* ninth attempt at homebrew build, this time getting rid of --flat_namespace when building
+dynamic libraries.
+
+December 31st 2021 ivtools-2.0.11a
+
+* eight attempt at homebrew build, add workaround for 118 character limit.
+
+December 31st 2021 ivtools-2.0.11
 
 * seventh and maybe last attempt at a release that might build with homebrew, before ivtools-2.1.0
 

diff --git a/config/site.def.DARWIN b/config/site.def.DARWIN
@@ -64,9 +64,9 @@
 #define SharedLibraryCmd(ldobjs,extra_flags) $(LD) -r extra_flags -o $@~ ldobjs
 #else
 #ifdef InstallRelative
-#define SharedLibraryCmdDarwin(ldobjs,depobjs,rev,libname) CCDriver -dynamiclib -install_name Prefix/lib/$(CPU)/$(AOUT) -current_version rev -compatibility_version rev -o $@~ ldobjs depobjs -flat_namespace -undefined suppress
+#define SharedLibraryCmdDarwin(ldobjs,depobjs,rev,libname) CCDriver $(DYLDLIBS) -dynamiclib -install_name Prefix/lib/$(CPU)/$(AOUT) -current_version rev -compatibility_version rev -o $@~ ldobjs depobjs
 #else
-#define SharedLibraryCmdDarwin(ldobjs,depobjs,rev,libname) CCDriver -dynamiclib -install_name Prefix/lib/$(AOUT) -current_version rev -compatibility_version rev -o $@~ ldobjs depobjs -flat_namespace -undefined suppress
+#define SharedLibraryCmdDarwin(ldobjs,depobjs,rev,libname) CCDriver $(DYLDLIBS) -dynamiclib -install_name Prefix/lib/$(AOUT) -current_version rev -compatibility_version rev -o $@~ ldobjs depobjs
 #endif
 #endif
 

diff --git a/src/AceDispatch/Imakefile b/src/AceDispatch/Imakefile
@@ -8,6 +8,9 @@ PACKAGE = AceDispatch
 
 LIB = AceDispatch
 
+Use_libInterViews()
+DYLDLIBS = -L$(XLIBDIR) $(LDLIBX11) $(LDLIBXEXT) $(LDLIBIV) $(LDLIBUNIDRAW) $(LIBUNIIDRAW)  ${ACE_CCLDLIBS} 
+
 OTHER_CCINCLUDES = $(ACE_CCINCLUDES)
 OTHER_CCDEFINES = $(ACE_CCDEFINES)
 

diff --git a/src/AttrGlyph/Imakefile b/src/AttrGlyph/Imakefile
@@ -8,6 +8,8 @@ PACKAGE = AttrGlyph
 
 LIB = AttrGlyph
 
+DYLDLIBS = -L$(XLIBDIR) -lX11 -lXext $(LDLIBIV) $(LIBATTRIBUTE) $(LIBUNIDRAWCOMMON) $(LIBIVGLYPH)
+
 Use_libInterViews()
 
 MakeLibrary($(LIB),$(VERSION))

diff --git a/src/Attribute/Imakefile b/src/Attribute/Imakefile
@@ -8,6 +8,8 @@ PACKAGE = Attribute
 
 LIB = Attribute
 
+DYLDLIBS = ${LIBIVCOMMON} ${LIBUNIDRAWCOMMON} ${LIBCOMUTIL}
+
 MakeLibrary($(LIB),$(VERSION))
 
 #define Obj(file) MakeObjectFromSrcFlags(file,)

diff --git a/src/ComGlyph/Imakefile b/src/ComGlyph/Imakefile
@@ -8,6 +8,8 @@ PACKAGE = ComGlyph
 
 LIB = ComGlyph
 
+DYLDLIBS = -L$(XLIBDIR) -lX11 -lXext $(LDLIBIV) $(LIBATTRIBUTE) $(LIBUNIDRAWCOMMON) $(LIBIVGLYPH) $(LIBATTRGLYPH) $(LIBCOMTERP) $(LIBCOMUTIL)
+
 Use_libInterViews()
 
 MakeLibrary($(LIB),$(VERSION))

diff --git a/src/ComTerp/Imakefile b/src/ComTerp/Imakefile
@@ -7,6 +7,9 @@ PACKAGE = ComTerp
 #ifdef InObjectCodeDir
 
 LIB = ComTerp
+
+DYLDLIBS = $(LIBCOMTERP) $(LIBTIME) $(LIBTOPOFACE) $(LIBATTRIBUTE) $(LIBCOMUTIL) $(LIBUNIDRAWCOMMON) $(LIBIVCOMMON) ${ACE_CCLDLIBS}
+
 CCSUFFIX = c
 
 OTHER_CCDEFINES = $(ACE_CCDEFINES)

diff --git a/src/ComTerp/comterpserv.c b/src/ComTerp/comterpserv.c
@@ -263,7 +263,8 @@ int ComTerpServ::run(boolean one_expr, boolean nested) {
 }
 
 int ComTerpServ::runfile(const char* filename, boolean popen_flag) {
-    /* save enough state as needed by this interpreter */
+
+  /* save enough state as needed by this interpreter */
     push_servstate();
     _inptr = this;
     _infunc = (infuncptr)&ComTerpServ::s_fgets;
@@ -283,8 +284,6 @@ int ComTerpServ::runfile(const char* filename, boolean popen_flag) {
       pop_servstate();
       return -1;
     }
-    FILEBUF(ibuf, ifptr, ios_base::in);
-    istream istr(&ibuf);
     ComValue* retval = nil;
     int status = 0;
 
@@ -295,13 +294,14 @@ int ComTerpServ::runfile(const char* filename, boolean popen_flag) {
     int tokoff = _pfoff;
 
     int last_status = 0;
-    while( istr.good()) {
+    while( !feof(ifptr) ) {
 #if defined(TIMING_TEST)
         static struct timeval tvBefore, tvAfter, tvParse, tvConvert, tvDiff;
 #endif
         *inbuf='\0';
-        istr.getline(inbuf, _linesize-1);
-	if (istr.eof() && !*inbuf)  // deal with last line without new-line
+        fgets(inbuf, _linesize-1, ifptr);
+
+ 	if (feof(ifptr) && !*inbuf)  // deal with last line without new-line
 	  break;
         if (_linenum==0 && !*inbuf) { // run a dummy space in to initialize parser
             inbuf[0]=' ';
@@ -386,7 +386,6 @@ int ComTerpServ::runfile(const char* filename, boolean popen_flag) {
 
     load_postfix(tokbuf, toklen, tokoff);
     delete tokbuf;
-    ibuf.close();
     if (ifptr) 
         if(popen_flag)
             pclose(ifptr);

diff --git a/src/ComUnidraw/Imakefile b/src/ComUnidraw/Imakefile
@@ -7,6 +7,9 @@ PACKAGE = ComUnidraw
 #ifdef InObjectCodeDir
 
 LIB = ComUnidraw
+
+DYLDLIBS = -L$(XLIBDIR) $(LDLIBX11) $(LDLIBXEXT) $(LDLIBIV) $(LDLIBUNIDRAW) $(LIBUNIIDRAW)  ${ACE_CCLDLIBS} $(LIBCOMTERP) $(LIBATTRIBUTE) $(LIBCOMUTIL) $(LIBTOPOFACE) $(CLIPPOLY_CCLDLIBS) $(LIBACEDISPATCH) $(LIBCOMGLYPH) $(LIBATTRGLYPH) $(LIBCOMUTIL) $(LIBIVGLYPH) $(LIBOVERLAYUNIDRAW)
+
 OTHER_CCDEFINES = $(ACE_CCDEFINES)
 OTHER_CCINCLUDES = $(ACE_CCINCLUDES)
 

diff --git a/src/ComUnidraw/pixelfunc.c b/src/ComUnidraw/pixelfunc.c
@@ -68,7 +68,7 @@ void PixelPokeLineFunc::execute() {
     for(int j=0; j<wval; j++){
       ColorIntensity r,g,b;
       int pixelcolor = pixelvals[j];
-      char colorname[7];
+      char colorname[8];
       sprintf(colorname,"#%06x",pixelcolor);
       Color::find(World::current()->display(),colorname, r, g, b);
       raster->poke(xval+j, yval, r, g, b, 1.0);
@@ -100,7 +100,7 @@ void PixelPokeFunc::execute() {
   if (raster) {
     ColorIntensity r,g,b;
     int pixelcolor = valv.int_val();
-    char colorname[7];
+    char colorname[8];
     sprintf(colorname,"#%06x",pixelcolor);
     Color::find(World::current()->display(),colorname, r, g, b);
     raster->poke(xv.int_val(), yv.int_val(), r, g, b, 1.0);

diff --git a/src/DrawServ/Imakefile b/src/DrawServ/Imakefile
@@ -14,6 +14,8 @@ OTHER_CCINCLUDES = $(ACE_CCINCLUDES)
 Use_libUnidraw()
 Use_2_6()
 
+DYLDLIBS = -L$(XLIBDIR) $(LDLIBX11) $(LDLIBXEXT) $(LDLIBIV) $(LDLIBUNIDRAW) $(LIBUNIIDRAW)  ${ACE_CCLDLIBS} $(LIBCOMTERP) $(LIBATTRIBUTE) $(LIBCOMUTIL) $(LIBTOPOFACE) $(CLIPPOLY_CCLDLIBS) $(LIBACEDISPATCH) $(LIBCOMGLYPH) $(LIBATTRGLYPH) $(LIBCOMUTIL) $(LIBIVGLYPH) $(LIBOVERLAYUNIDRAW) $(LIBCOMUNIDRAW) $(LIBGRAPHUNIDRAW) $(LIBFRAMEUNIDRAW)
+
 MakeLibrary($(LIB),$(VERSION))
 
 #define Obj26(file) MakeObjectFromSrcFlags(file,)

diff --git a/src/FrameUnidraw/Imakefile b/src/FrameUnidraw/Imakefile
@@ -11,6 +11,8 @@ LIB = FrameUnidraw
 Use_libUnidraw()
 Use_2_6()
 
+DYLDLIBS = -L$(XLIBDIR) $(LDLIBX11) $(LDLIBXEXT) $(LDLIBIV) $(LDLIBUNIDRAW) $(LIBUNIIDRAW)  ${ACE_CCLDLIBS} $(LIBCOMTERP) $(LIBATTRIBUTE) $(LIBCOMUTIL) $(LIBTOPOFACE) $(CLIPPOLY_CCLDLIBS) $(LIBACEDISPATCH) $(LIBCOMGLYPH) $(LIBATTRGLYPH) $(LIBCOMUTIL) $(LIBIVGLYPH) $(LIBOVERLAYUNIDRAW) $(LIBCOMUNIDRAW)
+
 MakeLibrary($(LIB),$(VERSION))
 
 #define Obj26(file) MakeObjectFromSrcFlags(file,)

diff --git a/src/GraphUnidraw/Imakefile b/src/GraphUnidraw/Imakefile
@@ -11,6 +11,8 @@ LIB = GraphUnidraw
 Use_libUnidraw()
 Use_2_6()
 
+DYLDLIBS = -L$(XLIBDIR) $(LDLIBX11) $(LDLIBXEXT) $(LDLIBIV) $(LDLIBUNIDRAW) $(LIBUNIIDRAW)  ${ACE_CCLDLIBS} $(LIBCOMTERP) $(LIBATTRIBUTE) $(LIBCOMUTIL) $(LIBTOPOFACE) $(CLIPPOLY_CCLDLIBS) $(LIBACEDISPATCH) $(LIBCOMGLYPH) $(LIBATTRGLYPH) $(LIBCOMUTIL) $(LIBIVGLYPH) $(LIBOVERLAYUNIDRAW) $(LIBCOMUNIDRAW)
+
 MakeLibrary($(LIB),$(VERSION))
 
 #define Obj26(file) MakeObjectFromSrcFlags(file,)

diff --git a/src/IV/Imakefile b/src/IV/Imakefile
@@ -6,6 +6,8 @@ PACKAGE = src_iv
 
 #ifdef InObjectCodeDir
 
+DYLDLIBS = -L$(XLIBDIR) -lX11 -lXext
+
 #ifdef TiffDir
 OTHER_CCDEFINES = $(TIFF_CCDEFINES)
 OTHER_CCINCLUDES = $(TIFF_CCINCLUDES)

diff --git a/src/IVGlyph/Imakefile b/src/IVGlyph/Imakefile
@@ -8,6 +8,8 @@ PACKAGE = IVGlyph
 
 LIB = IVGlyph
 
+DYLDLIBS = -L$(XLIBDIR) -lX11 -lXext $(LDLIBIV) $(LIBTIME)
+
 Use_libInterViews()
 
 MakeLibrary($(LIB),$(VERSION))

diff --git a/src/OverlayUnidraw/Imakefile b/src/OverlayUnidraw/Imakefile
@@ -7,6 +7,9 @@ PACKAGE = OverlayUnidraw
 #ifdef InObjectCodeDir
 
 LIB = OverlayUnidraw
+
+DYLDLIBS = -L$(XLIBDIR) $(LDLIBX11) $(LDLIBXEXT) $(LDLIBIV) $(LDLIBUNIDRAW) $(LIBUNIIDRAW)  ${ACE_CCLDLIBS} $(LIBCOMTERP) $(LIBATTRIBUTE) $(LIBCOMUTIL) $(LIBTOPOFACE) $(CLIPPOLY_CCLDLIBS) $(LIBACEDISPATCH) $(LIBCOMGLYPH) $(LIBATTRGLYPH) $(LIBCOMUTIL) $(LIBIVGLYPH)
+
 OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES)
 OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES)
 

diff --git a/src/Time/Imakefile b/src/Time/Imakefile
@@ -8,6 +8,8 @@ PACKAGE = Time
 
 LIB = Time
 
+DYLDLIBS = ${LIBIVCOMMON}
+
 Use_libInterViews()
 
 MakeLibrary($(LIB),$(VERSION))

diff --git a/src/TopoFace/Imakefile b/src/TopoFace/Imakefile
@@ -8,6 +8,7 @@ PACKAGE = TopoFace
 
 LIB = TopoFace
 
+DYLDLIBS = ${LIBIVCOMMON} ${LIBUNIDRAWCOMMON} ${LIBTOPOFACE}
 
 MakeLibrary($(LIB),$(VERSION))
 

diff --git a/src/UniIdraw/Imakefile b/src/UniIdraw/Imakefile
@@ -11,6 +11,8 @@ LIB = UniIdraw
 Use_libUnidraw()
 Use_2_6()
 
+DYLDLIBS = -L$(XLIBDIR) $(LDLIBX11) $(LDLIBXEXT) $(LDLIBIV) $(LDLIBUNIDRAW)
+
 MakeLibrary($(LIB),$(VERSION))
 
 #define Obj(file) MakeObjectFromSrcFlags(file,)

diff --git a/src/Unidraw-common/Imakefile b/src/Unidraw-common/Imakefile
@@ -9,6 +9,8 @@ NO_IVMKCM = 1
 
 LIB = Unidraw-common
 
+DYLDLIBS = ${LIBIVCOMMON}
+
 MakeLibrary($(LIB),$(VERSION))
 
 #define Obj(file) MakeObjectFromSrcFlags(file,-DUnidrawCommon)

diff --git a/src/Unidraw/Imakefile b/src/Unidraw/Imakefile
@@ -8,6 +8,9 @@ PACKAGE = Unidraw
 
 LIB = Unidraw
 
+Use_libInterViews()
+DYLDLIBS = -L$(XLIBDIR) $(LDLIBX11) $(LDLIBXEXT) $(LDLIBIV)
+
 MakeLibrary($(LIB),$(VERSION))
 
 #define Obj(file) MakeObjectFromSrcFlags(file,)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,6 +8,7 @@ PACKAGE = TopoFace

		LIB = TopoFace

		DYLDLIBS = ${LIBIVCOMMON} ${LIBUNIDRAWCOMMON} ${LIBTOPOFACE}

		MakeLibrary($(LIB),$(VERSION))

Expand Down