| 1 |
haubi 12/10/02 13:47:12 |
| 2 |
|
| 3 |
Added: cntlm-0.93_beta5-buildsystem.patch |
| 4 |
Log: |
| 5 |
Revbump beta version, bug#403375. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.65/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-proxy/cntlm/files/cntlm-0.93_beta5-buildsystem.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/cntlm/files/cntlm-0.93_beta5-buildsystem.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/cntlm/files/cntlm-0.93_beta5-buildsystem.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: cntlm-0.93_beta5-buildsystem.patch |
| 16 |
=================================================================== |
| 17 |
Gentoo Bug#334647: |
| 18 |
Respect CC, CFLAGS, LDFLAGS (with gcc). |
| 19 |
Support verbose building via 'make V=1'. |
| 20 |
--- configure.orig 2012-10-02 14:01:48.735669564 +0200 |
| 21 |
+++ configure 2012-10-02 14:23:01.224271511 +0200 |
| 22 |
@@ -10,7 +10,7 @@ |
| 23 |
# This can be disabled if neccessary. |
| 24 |
# |
| 25 |
|
| 26 |
-CCS="xlc_r gcc" |
| 27 |
+CCS=${CC-"xlc_r gcc"} |
| 28 |
|
| 29 |
# |
| 30 |
# Look for supported compilers |
| 31 |
@@ -31,15 +31,21 @@ |
| 32 |
else |
| 33 |
echo "Using $CCPATH to compile Cntlm" |
| 34 |
[ -h Makefile ] && rm -f Makefile 2>/dev/null |
| 35 |
- case "$CC" in |
| 36 |
- gcc) |
| 37 |
+ if $CC -v >/dev/null 2>&1; then |
| 38 |
# default Makefile is for GCC; just revert back to |
| 39 |
# GCC if Makefile is linked to other compiler version |
| 40 |
if [ ! -f Makefile ]; then |
| 41 |
mv Makefile.gcc Makefile |
| 42 |
fi |
| 43 |
- ;; |
| 44 |
- *) |
| 45 |
+ : ${CFLAGS=-O3} |
| 46 |
+ : ${LDFLAGS=} |
| 47 |
+ CFLAGS="$CFLAGS -std=c99 -Wall -Wno-unused-but-set-variable -pedantic -pthread" |
| 48 |
+ LDFLAGS="$LDFLAGS -pthread" |
| 49 |
+ sed -e "s~^CFLAGS[ :]*=~CFLAGS=$CFLAGS ~" \ |
| 50 |
+ -e "s~^LDFLAGS[ :]*=.*~LDFLAGS=$LDFLAGS~" \ |
| 51 |
+ -e "s~^CC[ :]*=.*~CC=$CC~" \ |
| 52 |
+ -i Makefile |
| 53 |
+ else |
| 54 |
# backup default GCC Makefile and create a link to other |
| 55 |
if [ -f Makefile ]; then |
| 56 |
mv Makefile Makefile.gcc |
| 57 |
@@ -47,8 +53,7 @@ |
| 58 |
|
| 59 |
EXT=`echo "$CC" | sed 's/_.*//'` |
| 60 |
ln -s Makefile.$EXT Makefile |
| 61 |
- ;; |
| 62 |
- esac |
| 63 |
+ fi |
| 64 |
fi |
| 65 |
|
| 66 |
STAMP=configure-stamp |
| 67 |
@@ -62,7 +67,7 @@ |
| 68 |
for i in $TESTS; do |
| 69 |
printf "Checking $i... " |
| 70 |
printf "#define config_$i " >> $CONFIG |
| 71 |
- OUT=`$CC -D_POSIX_C_SOURCE=199506L -D_ISOC99_SOURCE -D_REENTRANT -o config/$i config/$i.c 2>&1` |
| 72 |
+ OUT=`$CC $CFLAGS $LDFLAGS -D_POSIX_C_SOURCE=199506L -D_ISOC99_SOURCE -D_REENTRANT -o config/$i config/$i.c 2>&1` |
| 73 |
rc=$? |
| 74 |
|
| 75 |
if [ $rc -ne 0 ]; then # -o -n "$OUT" ]; then |
| 76 |
--- Makefile.orig 2012-10-02 15:31:03.986270993 +0200 |
| 77 |
+++ Makefile 2012-10-02 15:40:10.277689068 +0200 |
| 78 |
@@ -16,14 +16,13 @@ |
| 79 |
CC := gcc |
| 80 |
VER := $(shell cat VERSION) |
| 81 |
OS := $(shell uname -s) |
| 82 |
-OSLDFLAGS := $(shell [ $(OS) = "SunOS" ] && echo "-lrt -lsocket -lnsl") |
| 83 |
-LDFLAGS := -lpthread $(OSLDFLAGS) |
| 84 |
+LIBS := $(shell [ $(OS) = "SunOS" ] && echo "-lrt -lsocket -lnsl") |
| 85 |
+LDFLAGS := -pthread |
| 86 |
CYGWIN_REQS := cygwin1.dll cyggcc_s-1.dll cygstdc++-6.dll cygrunsrv.exe |
| 87 |
|
| 88 |
+CFLAGS=-D__BSD_VISIBLE -D_ALL_SOURCE -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112 -D_ISOC99_SOURCE -D_REENTRANT -D_BSD_SOURCE -DVERSION=\"'$(VER)'\" |
| 89 |
ifeq ($(DEBUG),1) |
| 90 |
- CFLAGS += -g -std=c99 -Wall -pedantic -D__BSD_VISIBLE -D_ALL_SOURCE -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112 -D_ISOC99_SOURCE -D_REENTRANT -D_BSD_SOURCE -DVERSION=\"'$(VER)'\" |
| 91 |
-else |
| 92 |
- CFLAGS += -O3 -std=c99 -D__BSD_VISIBLE -D_ALL_SOURCE -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200112 -D_ISOC99_SOURCE -D_REENTRANT -D_BSD_SOURCE -DVERSION=\"'$(VER)'\" |
| 93 |
+ CFLAGS += -g -O0 |
| 94 |
endif |
| 95 |
|
| 96 |
ifneq ($(findstring CYGWIN,$(OS)),) |
| 97 |
@@ -32,28 +31,35 @@ |
| 98 |
OBJS=utils.o ntlm.o xcrypt.o config.o socket.o acl.o auth.o http.o forward.o direct.o scanner.o pages.o main.o |
| 99 |
endif |
| 100 |
|
| 101 |
+VE_=@echo |
| 102 |
+VE_1=@: |
| 103 |
+VE=$(VE_$(V)) |
| 104 |
+VV_=@ |
| 105 |
+VV_1= |
| 106 |
+VV=$(VV_$(V)) |
| 107 |
+ |
| 108 |
$(NAME): configure-stamp $(OBJS) |
| 109 |
- @echo "Linking $@" |
| 110 |
- @$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) |
| 111 |
+ $(VE) "Linking $@" |
| 112 |
+ $(VV) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) |
| 113 |
|
| 114 |
main.o: main.c |
| 115 |
- @echo "Compiling $<" |
| 116 |
- @if [ -z "$(SYSCONFDIR)" ]; then \ |
| 117 |
+ $(VE) "Compiling $<" |
| 118 |
+ $(VV) if [ -z "$(SYSCONFDIR)" ]; then \ |
| 119 |
$(CC) $(CFLAGS) -c main.c -o $@; \ |
| 120 |
else \ |
| 121 |
$(CC) $(CFLAGS) -DSYSCONFDIR=\"$(SYSCONFDIR)\" -c main.c -o $@; \ |
| 122 |
fi |
| 123 |
|
| 124 |
%.o: %.c |
| 125 |
- @echo "Compiling $<" |
| 126 |
- @$(CC) $(CFLAGS) -c -o $@ $< |
| 127 |
+ $(VE) "Compiling $<" |
| 128 |
+ $(VV) $(CC) $(CFLAGS) -c -o $@ $< |
| 129 |
|
| 130 |
configure-stamp: |
| 131 |
./configure |
| 132 |
|
| 133 |
win/resources.o: win/resources.rc |
| 134 |
- @echo Adding EXE resources |
| 135 |
- @windres $^ -o $@ |
| 136 |
+ $(VE) Adding EXE resources |
| 137 |
+ $(VV) windres $^ -o $@ |
| 138 |
|
| 139 |
install: $(NAME) |
| 140 |
# Special handling for install(1) |
| 141 |
@@ -115,31 +121,31 @@ |
| 142 |
|
| 143 |
$(NAME)-$(VER)-win32.exe: |
| 144 |
@echo - preparing binaries for GUI installer |
| 145 |
- @cp $(patsubst %, /bin/%, $(CYGWIN_REQS)) win/ |
| 146 |
+ $(VV) cp $(patsubst %, /bin/%, $(CYGWIN_REQS)) win/ |
| 147 |
ifeq ($(DEBUG),1) |
| 148 |
- @cp -p cntlm.exe win/ |
| 149 |
+ $(VV) cp -p cntlm.exe win/ |
| 150 |
else |
| 151 |
- @strip -o win/cntlm.exe cntlm.exe |
| 152 |
+ $(VV) strip -o win/cntlm.exe cntlm.exe |
| 153 |
endif |
| 154 |
@echo - generating GUI installer |
| 155 |
- @win/Inno5/ISCC.exe /Q win/setup.iss #/Q win/setup.iss |
| 156 |
+ $(VV) win/Inno5/ISCC.exe /Q win/setup.iss #/Q win/setup.iss |
| 157 |
|
| 158 |
$(NAME)-$(VER)-win32.zip: |
| 159 |
@echo - creating ZIP release for manual installs |
| 160 |
- @ln -s win $(NAME)-$(VER) |
| 161 |
+ $(VV) ln -s win $(NAME)-$(VER) |
| 162 |
zip -9 $(NAME)-$(VER)-win32.zip $(patsubst %, $(NAME)-$(VER)/%, $(CYGWIN_REQS) cntlm.ini LICENSE.txt cntlm_manual.pdf) |
| 163 |
- @rm -f $(NAME)-$(VER) |
| 164 |
+ $(VV) rm -f $(NAME)-$(VER) |
| 165 |
|
| 166 |
win/cntlm.ini: doc/cntlm.conf |
| 167 |
- @cat doc/cntlm.conf | unix2dos > win/cntlm.ini |
| 168 |
+ $(VV) cat doc/cntlm.conf | unix2dos > win/cntlm.ini |
| 169 |
|
| 170 |
win/LICENSE.txt: COPYRIGHT LICENSE |
| 171 |
- @cat COPYRIGHT LICENSE | unix2dos > win/LICENSE.txt |
| 172 |
+ $(VV) cat COPYRIGHT LICENSE | unix2dos > win/LICENSE.txt |
| 173 |
|
| 174 |
win/cntlm_manual.pdf: doc/cntlm.1 |
| 175 |
@echo - generating PDF manual |
| 176 |
- @rm -f win/cntlm_manual.pdf |
| 177 |
- @groff -t -e -mandoc -Tps doc/cntlm.1 | ps2pdf - win/cntlm_manual.pdf |
| 178 |
+ $(VV) rm -f win/cntlm_manual.pdf |
| 179 |
+ $(VV) groff -t -e -mandoc -Tps doc/cntlm.1 | ps2pdf - win/cntlm_manual.pdf |
| 180 |
|
| 181 |
win/setup.iss: win/setup.iss.in |
| 182 |
ifeq ($(findstring CYGWIN,$(OS)),) |
| 183 |
@@ -148,16 +154,16 @@ |
| 184 |
@echo |
| 185 |
@exit 1 |
| 186 |
endif |
| 187 |
- @sed "s/\$$VERSION/$(VER)/g" $^ > $@ |
| 188 |
+ $(VV) sed "s/\$$VERSION/$(VER)/g" $^ > $@ |
| 189 |
|
| 190 |
uninstall: |
| 191 |
rm -f $(BINDIR)/$(NAME) $(MANDIR)/man1/$(NAME).1 2>/dev/null || true |
| 192 |
|
| 193 |
clean: |
| 194 |
- @rm -f config/endian config/gethostname config/strdup config/socklen_t config/*.exe |
| 195 |
- @rm -f *.o cntlm cntlm.exe configure-stamp build-stamp config/config.h |
| 196 |
+ $(VV) rm -f config/endian config/gethostname config/strdup config/socklen_t config/*.exe |
| 197 |
+ $(VV) rm -f *.o cntlm cntlm.exe configure-stamp build-stamp config/config.h |
| 198 |
rm -f $(patsubst %, win/%, $(CYGWIN_REQS) cntlm.exe cntlm.ini LICENSE.txt setup.iss cntlm_manual.pdf) |
| 199 |
- @if [ -h Makefile ]; then rm -f Makefile; mv Makefile.gcc Makefile; fi |
| 200 |
+ $(VV) if [ -h Makefile ]; then rm -f Makefile; mv Makefile.gcc Makefile; fi |
| 201 |
|
| 202 |
distclean: clean |
| 203 |
ifeq ($(findstring CYGWIN,$(OS)),) |
| 204 |
@@ -169,6 +175,6 @@ |
| 205 |
fakeroot rpm/rules clean; \ |
| 206 |
fi |
| 207 |
endif |
| 208 |
- @rm -f *.exe *.deb *.rpm *.tgz *.tar.gz *.tar.bz2 *.zip *.exe tags ctags pid 2>/dev/null |
| 209 |
+ $(VV) rm -f *.exe *.deb *.rpm *.tgz *.tar.gz *.tar.bz2 *.zip *.exe tags ctags pid 2>/dev/null |
| 210 |
|
| 211 |
.PHONY: all install tgz tbz2 deb rpm win uninstall clean distclean |
Archives