updates to get mac OS working again
authorChris Koeritz <cak0l@virginia.edu>
Wed, 19 Feb 2020 20:10:17 +0000 (15:10 -0500)
committerChris Koeritz <cak0l@virginia.edu>
Wed, 19 Feb 2020 20:10:17 +0000 (15:10 -0500)
note that building on recent versions of mac os requires the "brew" tools, which provide the gnu versions of a bunch of apps.  if there are complaints about command line flags, then it's probably because brew hasn't been used to replace the default mac tool.
here are some links that can help set this up:
https://brew.sh
https://gist.github.com/skyzyx/3438280b18e4f7c490db8a2a2ca0b9da
https://medium.com/@timmykko/using-openssl-library-with-macos-sierra-7807cfd47892

scripts/clam/cpp/rules.def
scripts/clam/cpp/variables.def

index 40a72ba49f22903464a01799b25f2de0a1c3f2d1..ca59f82360a30ad4341b456d98c1872406c927b5 100644 (file)
@@ -115,7 +115,7 @@ ifeq "$(COMPILER)" "GNU_DARWIN"
   endif
 
   ifneq "$(USE_SSL)" ""
-    LIBS_USED += crypto
+    LIBS_USED += crypto ssl
   endif
   
   ifneq "$(USE_WXWIDGETS)" ""
index c9210586b8b3ab3003de4cdaca976ef3e966f3f0..94e0f3d0dc08846cd763183468f56cfa3cae24b0 100644 (file)
@@ -928,9 +928,7 @@ ifeq "$(COMPILER)" "GNU_DARWIN"
   DEPENDENCY_DEFINITIONS += NO_VERSION
   DEPENDENCY_ADDITIONS = -X/usr/include -X/usr/include/c++/$(COMPILER_VERSION) -X/usr/include/c++/$(COMPILER_VERSION)/tr1 -X/usr/local/include -X/usr/include/linux -X/usr/include/wx-2.8 -X/usr/lib/gcc/i586-suse-linux/$(COMPILER_VERSION)/include -X/usr/lib/gcc/i486-linux-gnu/$(COMPILER_VERSION)/include
 
-#protect other additions to make them only for debian?
-#  COMPILER_HEADER_DIR := /usr/include /usr/local/include 
-  COMPILER_HEADER_DIR := /System/Library/Frameworks/Foundation.framework/Versions/C/Headers
+  COMPILER_HEADER_DIR := /usr/local/include /usr/include /System/Library/Frameworks/Foundation.framework/Versions/C/Headers
 
   # "USE_XWIN" specifies that this project needs X window system support.
   #USE_XWIN =
@@ -939,8 +937,7 @@ ifeq "$(COMPILER)" "GNU_DARWIN"
 #    COMPILER_LIBRARY_DIR = /lib64 /usr/lib64 /usr/local/lib64
 #  else
 
-    COMPILER_LIBRARY_DIR = /usr/lib 
-###/usr/local/lib
+    COMPILER_LIBRARY_DIR = /usr/lib /usr/local/lib
 #/lib 
 
 #  endif