Forráskód Böngészése

allow to build with MacOS X Yosemite and Homebrew.

Waldemar Brodkorb 9 éve
szülő
commit
8da9efaa28
3 módosított fájl, 13 hozzáadás és 6 törlés
  1. 5 0
      adk/config/Makefile
  2. 3 3
      mk/vars.mk
  3. 5 3
      scripts/scan-tools.sh

+ 5 - 0
adk/config/Makefile

@@ -27,6 +27,10 @@ else
 ifeq (/usr/local/include/ncurses/curses.h, $(wildcard /usr/local/include/ncurses/curses.h))
 HOST_CFLAGS+=	-I/usr/local/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
 else
+ifeq (/usr/local/opt/ncurses/include/ncursesw/ncurses.h, $(wildcard /usr/local/opt/ncurses/include/ncursesw/ncurses.h))
+HOST_CFLAGS+=	-I/usr/local/opt/ncurses/include -DCURSES_LOC="<ncursesw/ncurses.h>"
+LIBS+=		-L/usr/local/opt/ncurses/lib -Wl,-rpath -Wl,/usr/local/opt/ncurses/lib
+else
 ifeq (/usr/pkg/include/ncurses.h, $(wildcard /usr/pkg/include/ncurses.h))
 HOST_CFLAGS+=	-I/usr/pkg/include -DCURSES_LOC="<ncurses.h>"
 LIBS+=		-L/usr/pkg/lib -Wl,-rpath -Wl,/usr/pkg/lib
@@ -42,6 +46,7 @@ endif
 endif
 endif
 endif
+endif
 
 CONF_SRC  =conf.c
 MCONF_SRC =mconf.c $(wildcard lxdialog/*.c)

+ 3 - 3
mk/vars.mk

@@ -273,9 +273,9 @@ PKG_INSTALL:=		PATH='${HOST_PATH}' \
 			-force-defaults -force-depends install
 PKG_STATE_DIR:=		$(TARGET_DIR)/usr/lib/ipkg
 else
-PKG_BUILD:=		${BASH} ${SCRIPT_DIR}/tarpkg build
-PKG_INSTALL:=		PKG_INSTROOT=$(TARGET_DIR) \
-			${BASH} ${SCRIPT_DIR}/tarpkg install
+PKG_BUILD:=		PATH='${HOST_PATH}' ${BASH} ${SCRIPT_DIR}/tarpkg build
+PKG_INSTALL:=		PKG_INSTROOT='$(TARGET_DIR)' \
+			PATH='${HOST_PATH}' ${BASH} ${SCRIPT_DIR}/tarpkg install
 PKG_STATE_DIR:=		$(TARGET_DIR)/usr/lib/pkg
 endif
 

+ 5 - 3
scripts/scan-tools.sh

@@ -157,9 +157,11 @@ fi
 if [[ ! -s /usr/include/ncurses.h ]]; then
 	if [[ ! -s /usr/include/curses.h ]]; then
 		if [[ ! -s /usr/include/ncurses/ncurses.h ]]; then
-			echo Install ncurses header files, please.
-			echo
-			out=1
+			if [[ ! -s /usr/local/opt/ncurses/include/ncursesw/ncurses.h ]]; then
+				echo Install ncurses header files, please.
+				echo
+				out=1
+			fi
 		fi
 	fi
 fi