From 86927db89773681c7dae5823c03ba9ba23873c41 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Fri, 3 Oct 2014 12:46:21 +0300 Subject: [PATCH] Allowed to build on Darwin. --- projects/sgauth/Makefile | 2 +- projects/sgauth/build | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile index a59371c9..ef649119 100644 --- a/projects/sgauth/Makefile +++ b/projects/sgauth/Makefile @@ -32,7 +32,7 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS)))) CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS) CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS) -LDFLAGS += -Wl,-E $(STGLIBS_LIBS) +LDFLAGS += $(STGLIBS_LIBS) .PHONY: all clean distclean libs install uninstall install-bin install-data uninstall-bin uninstall-data all: libs $(PROG) ../../Makefile.conf diff --git a/projects/sgauth/build b/projects/sgauth/build index 82a3dcf6..0628676a 100755 --- a/projects/sgauth/build +++ b/projects/sgauth/build @@ -51,6 +51,16 @@ then MAKE="gmake" fi +if [ "$sys" = "Darwin" ] +then + OS=darwin + ETC_DIR="./inst/freebsd/etc/stargazer" + MAKE="gmake" + CFLAGS="$CFLAGS -I/opt/local/include" + CXXFLAGS="$CFLAGS -I/opt/local/include" + LDFLAGS="$LDFLAGS -L/opt/local/lib" +fi + if [ "$OS" = "unknown" ] then printf "#############################################################################\n" @@ -76,14 +86,19 @@ else if [ "$OS" = "bsd" ] then DEFS="$DEFS -DFREE_BSD" - LIB_THREAD=-lc_r else - DEFS="$DEFS -DFREE_BSD5" if [ "$OS" = "bsd7" ] then + DEFS="$DEFS -DFREE_BSD5" LIB_THREAD=-lpthread else - LIB_THREAD=-lc_r + if [ "$OS" == "darwin" ] + then + DEFS="$DEFS -DDARWIN" + LIB_THREAD=-lpthread + else + LIB_THREAD=-lc_r + fi fi fi fi -- 2.44.2