FreeBSD fixes.

This commit is contained in:
Jan Vidar Krey 2009-03-16 22:49:55 +01:00
parent 7dc88bd23f
commit 008ec7c8df
3 changed files with 17 additions and 9 deletions

View File

@ -15,7 +15,7 @@ BITS ?= AUTO
SILENT ?= YES SILENT ?= YES
LDLIBS += -levent LDLIBS += -levent
TERSE ?= NO TERSE ?= NO
STACK_PROTECT ?= NO
ifeq ($(OS), Windows_NT) ifeq ($(OS), Windows_NT)
WINDOWS ?= YES WINDOWS ?= YES
@ -67,11 +67,16 @@ LDFLAGS += -L/source/libevent
-include release_setup.mk -include release_setup.mk
ifeq ($(RELEASE),YES) ifeq ($(RELEASE),YES)
CFLAGS += -Os -DNDEBUG -fstack-protector-all CFLAGS += -Os -DNDEBUG
else else
CFLAGS += -g -DDEBUG -fstack-protector-all CFLAGS += -g -DDEBUG
endif endif
ifeq ($(STACK_PROTECT),YES)
CFLAGS += -fstack-protector-all
endif
ifeq ($(PROFILING),YES) ifeq ($(PROFILING),YES)
CFLAGS += -pg CFLAGS += -pg
LDFLAGS += -pg LDFLAGS += -pg

View File

@ -26,7 +26,8 @@ URL_ARCHIVE='build-archive:~/uhub/'
URL_PUBLISH='domeneshop:~/www/downloads/uhub/' URL_PUBLISH='domeneshop:~/www/downloads/uhub/'
URL_SNAPSHOT='domeneshop:~/www/downloads/uhub/snapshots/' URL_SNAPSHOT='domeneshop:~/www/downloads/uhub/snapshots/'
function export_source_directory() { function export_source_directory
{
if [ -d ${PACKAGE} ]; then if [ -d ${PACKAGE} ]; then
rm -Rf ${PACKAGE}; rm -Rf ${PACKAGE};
fi fi
@ -36,7 +37,7 @@ function export_source_directory() {
exit 1 exit 1
fi fi
git archive --format=tar --prefix=${PACKAGE}/ HEAD | tar x git archive --format=tar --prefix=${PACKAGE}/ HEAD > tmp.tar && tar -xf tmp.tar && rm tmp.tar
if [ ! -d ${PACKAGE} ]; then if [ ! -d ${PACKAGE} ]; then
echo "Something went wrong while exporting the repo." echo "Something went wrong while exporting the repo."
@ -44,7 +45,7 @@ function export_source_directory() {
fi fi
} }
function package_zips() function package_zips
{ {
tar cf $1.tar $2 tar cf $1.tar $2
gzip -c -9 $1.tar > $1.tar.gz gzip -c -9 $1.tar > $1.tar.gz
@ -53,7 +54,7 @@ function package_zips()
zip -q -9 -r $1.zip $2 zip -q -9 -r $1.zip $2
} }
function export_sources() function export_sources
{ {
export_source_directory export_source_directory
make autotest.c && cp autotest.c ${PACKAGE}/autotest.c make autotest.c && cp autotest.c ${PACKAGE}/autotest.c
@ -65,7 +66,7 @@ function export_sources()
cp ChangeLog ChangeLog-${VERSION} cp ChangeLog ChangeLog-${VERSION}
} }
function export_binaries() function export_binaries
{ {
export_source_directory export_source_directory
rm -Rf ${PACKAGE}/admin rm -Rf ${PACKAGE}/admin

View File

@ -1,4 +1,6 @@
#!/bin/sh #!/bin/bash
# set -x
ME=`dirname $0` ME=`dirname $0`
. ${ME}/common.sh . ${ME}/common.sh