commit fdf4cb2e96fdacc4d1a4866a203986bfbb149e02 Author: Emil Renner Berthing Date: Mon Jan 3 18:10:07 2011 +0100 use CFLAGS and LDFLAGS diff --git a/Makefile b/Makefile index 53bcee9..9f0d62e 100644 --- a/Makefile +++ b/Makefile @@ -6,24 +6,27 @@ FETCH_WITH_OPENSSL = true WARNINGS = -Wall -Wstrict-prototypes -Wsign-compare -Wchar-subscripts \ -Wpointer-arith -Wcast-align -CFLAGS = -O2 -pipe -I. -fPIC $(WARNINGS) \ +CFLAGS = -O2 -pipe +ACFLAGS = $(CFLAGS) -I. -fPIC $(WARNINGS) \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES +LDFLAGS = +ALDFLAGS = $(LDFLAGS) -CFLAGS += -DFTP_COMBINE_CWDS -DNETBSD +ACFLAGS += -DFTP_COMBINE_CWDS -DNETBSD ifeq ($(strip $(FETCH_WITH_INET6)), true) -CFLAGS+= -DINET6 +ACFLAGS+= -DINET6 endif ifeq ($(strip $(FETCH_WITH_OPENSSL)), true) -CFLAGS+= -DWITH_SSL -LDFLAGS= -lssl -lcrypto +ACFLAGS+= -DWITH_SSL +ALDFLAGS+= -lssl -lcrypto endif ifeq ($(strip $(DEBUG)), true) -CFLAGS += -g -DDEBUG +ACFLAGS += -g -DDEBUG else -CFLAGS += -UDEBUG +ACFLAGS += -UDEBUG endif CC = gcc @@ -46,7 +49,7 @@ all: libfetch.so libfetch.a %.o: %.c $(INCS) $(GEN) $(E) " compile " $@ - $(Q) $(CC) $(CFLAGS) -c $< + $(Q) $(CC) $(ACFLAGS) -c $< ftperr.h: ftp.errors Makefile errlist.sh $(E) " generate " $@ @@ -60,14 +63,14 @@ libfetch.so: $(GEN) $(INCS) $(OBJS) $(E) " build " $@ $(Q) rm -f $@ $(Q) $(LD) $(LDFLAGS) *.o -shared -o $@ - $(E) " built with: " $(CFLAGS) + $(E) " built with: " $(ACFLAGS) libfetch.a: $(GEN) $(INCS) $(OBJS) $(E) " build " $@ $(Q) rm -f $@ $(Q) $(AR) rcs $@ *.o $(Q) $(RANLIB) $@ - $(E) " built with: " $(CFLAGS) + $(E) " built with: " $(ACFLAGS) clean: $(E) " clean " diff --git a/PKGBUILD b/PKGBUILD index db79fb4..0f2f15f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ depends=('openssl>=1.0.0') url="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/net/libfetch/" source=(Makefile ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('5167d18db7660228e75290fc7d25fe56' +md5sums=('45946e6254480d62623c9c2fd972109d' 'a176b94f7f30344ef8a71c047ca2136b') # keep an upgrade path for older installations @@ -34,7 +34,7 @@ mksource() { build() { cd $srcdir/$pkgname-$pkgver cp $srcdir/Makefile . - make || return 1 + make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" || return 1 } package() {