fixes for ARM build

This commit is contained in:
Neale Pickett 2012-05-10 12:32:09 -06:00
parent 171546aeff
commit a885277a68
7 changed files with 27 additions and 21 deletions

View File

@ -10,6 +10,11 @@ CACHE = cache
# The end result # The end result
BIN = bin BIN = bin
ifdef ARCH
export CC = ${ARCH}-cc
export STRIP = ${ARCH}-strip
endif
all: packages all: packages
dist: ctf-install.zip dist: ctf-install.zip

View File

@ -3,7 +3,7 @@ DESTDIR ?= /tmp
build: cowd cowcli build: cowd cowcli
cowcli: cowcli.c cowcli: cowcli.c
$(CC) -o $@ -static $< cc -o $@ -static $<
strip $@ strip $@
upx $@ upx $@

View File

@ -1,24 +1,24 @@
INFERNO_PKGDIR = $(TARGET)/inferno INFERNO_PKGDIR = $(TARGET)/inferno
INFERNO_BUILDDIR = $(BUILD)/inferno INFERNO_BUILDDIR = $(BUILD)/inferno
INFERNO_FNORD_CACHE = $(CACHE)/fnord.git INFERNO_ERIS_CACHE = $(CACHE)/eris.git
INFERNO_FNORD_URL = http://woozle.org/~neale/projects/fnord INFERNO_ERIS_URL = http://woozle.org/~neale/projects/eris
$(INFERNO_FNORD_CACHE): $(INFERNO_ERIS_CACHE):
git clone --bare $(INFERNO_FNORD_URL) $@ git clone --bare $(INFERNO_ERIS_URL) $@
inferno-source: $(INFERNO_BUILDDIR) inferno-source: $(INFERNO_BUILDDIR)
$(INFERNO_BUILDDIR): $(INFERNO_FNORD_CACHE) $(INFERNO_BUILDDIR): $(INFERNO_ERIS_CACHE)
git clone $< $@ git clone $< $@
inferno-build: $(INFERNO_BUILDDIR)/build inferno-build: $(INFERNO_BUILDDIR)/build
$(INFERNO_BUILDDIR)/build: $(INFERNO_BUILDDIR) $(INFERNO_BUILDDIR)/build: $(INFERNO_BUILDDIR)
$(MAKE) -C $(INFERNO_BUILDDIR) fnord-idx $(MAKE) -C $(INFERNO_BUILDDIR)
inferno-install: $(INFERNO_BUILDDIR)/build inferno-install: $(INFERNO_BUILDDIR)/build
mkdir -p $(INFERNO_PKGDIR)/bin mkdir -p $(INFERNO_PKGDIR)/bin
cp $(INFERNO_BUILDDIR)/fnord-idx $(INFERNO_PKGDIR)/bin/ cp $(INFERNO_BUILDDIR)/eris $(INFERNO_PKGDIR)/bin/
$(call COPYTREE, packages/inferno/service, $(INFERNO_PKGDIR)/service) $(call COPYTREE, packages/inferno/service, $(INFERNO_PKGDIR)/service)

View File

@ -4,5 +4,5 @@ exec 2>&1
cd /var/www cd /var/www
exec tcpsvd -l localhost 0 80 /opt/inferno/bin/fnord-idx . . exec tcpsvd -l localhost 0 80 /opt/inferno/bin/eris -d

View File

@ -3,26 +3,26 @@ MCP_BUILDDIR = $(BUILD)/mcp
## ##
## XXX: clean up fnord like router.mk ## XXX: clean up eris like router.mk
## ##
FNORD_CACHE = $(CACHE)/fnord.git ERIS_CACHE = $(CACHE)/eris.git
FNORD_BUILDDIR = $(MCP_BUILDDIR)/fnord ERIS_BUILDDIR = $(MCP_BUILDDIR)/eris
FNORD_URL = http://woozle.org/~neale/projects/fnord ERIS_URL = http://woozle.org/~neale/projects/eris
$(FNORD_CACHE): $(ERIS_CACHE):
git clone --bare $(FNORD_URL) $@ git clone --bare $(ERIS_URL) $@
mcp-source: $(MCP_BUILDDIR)/source mcp-source: $(MCP_BUILDDIR)/source
$(MCP_BUILDDIR)/source: $(FNORD_CACHE) $(MCP_BUILDDIR)/source: $(ERIS_CACHE)
mkdir -p $(@D) mkdir -p $(@D)
git clone $(FNORD_CACHE) $(@D)/fnord git clone $(ERIS_CACHE) $(@D)/eris
touch $@ touch $@
mcp-build: $(MCP_BUILDDIR)/build mcp-build: $(MCP_BUILDDIR)/build
$(MCP_BUILDDIR)/build: $(MCP_BUILDDIR)/source $(MCP_BUILDDIR)/build: $(MCP_BUILDDIR)/source
$(MAKE) -C packages/mcp/src build $(MAKE) -C packages/mcp/src build
$(MAKE) -C $(MCP_BUILDDIR)/fnord DIET= CC=$(CC) fnord-cgi $(MAKE) -C $(MCP_BUILDDIR)/eris
mcp-install: $(MCP_BUILDDIR)/build mcp-install: $(MCP_BUILDDIR)/build
@ -32,7 +32,7 @@ mcp-install: $(MCP_BUILDDIR)/build
cp packages/mcp/src/pointscli $(MCP_PKGDIR)/bin/ cp packages/mcp/src/pointscli $(MCP_PKGDIR)/bin/
cp packages/mcp/src/puzzles.cgi $(MCP_PKGDIR)/bin/ cp packages/mcp/src/puzzles.cgi $(MCP_PKGDIR)/bin/
cp $(MCP_BUILDDIR)/fnord/fnord-cgi $(MCP_PKGDIR)/bin/ cp $(MCP_BUILDDIR)/eris/eris $(MCP_PKGDIR)/bin/
$(call COPYTREE, packages/mcp/service, $(MCP_PKGDIR)/service) $(call COPYTREE, packages/mcp/service, $(MCP_PKGDIR)/service)

View File

@ -18,4 +18,5 @@ for d in /opt/*; do
fi fi
done done
exec tcpsvd -u ctf ${IP%/*} 80 /opt/mcp/bin/fnord-cgi /var/www cd /var/www
exec tcpsvd -u ctf ${IP%/*} 80 /opt/mcp/bin/eris -c

View File

@ -59,7 +59,7 @@ $(ECMH_BUILDDIR): $(ECMH_CACHE)
router-build: $(ROUTER_BUILDDIR)/ecmh-build router-build: $(ROUTER_BUILDDIR)/ecmh-build
$(ROUTER_BUILDDIR)/ecmh-build: $(ECMH_BUILDDIR) $(ROUTER_BUILDDIR)/ecmh-build: $(ECMH_BUILDDIR)
$(MAKE) -C $(ECMH_BUILDDIR)/src ECMH_VERSION=dbtl-git $(MAKE) -C $(ECMH_BUILDDIR)/src ECMH_VERSION=dbtl-git STRIP=$(STRIP)
$(MAKE) -C $(ECMH_BUILDDIR)/tools/mtrace6 $(MAKE) -C $(ECMH_BUILDDIR)/tools/mtrace6
touch $@ touch $@