Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 500698 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-13 / +13 lines)
Line  Link Here
0
-- icon-v951src/ipl/cfuncs/Makefile
0
++ icon-v951src/ipl/cfuncs/Makefile
Lines 25-31 Link Here
25
# library
25
# library
26
26
27
$(FUNCLIB):	$(FUNCS) mklib.sh
27
$(FUNCLIB):	$(FUNCS) mklib.sh
28
		CC="$(CC)" CFLAGS="$(CFLAGS)" BIN="../../bin" \
28
		CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" BIN="../../bin" \
29
		    sh mklib.sh $(FUNCLIB) $(FUNCS)
29
		    sh mklib.sh $(FUNCLIB) $(FUNCS)
30
$(FUNCS):	icall.h
30
$(FUNCS):	icall.h
31
31
32
-- icon-v951src/ipl/cfuncs/mklib.sh
32
++ icon-v951src/ipl/cfuncs/mklib.sh
Lines 12-18 Link Here
12
set -x
12
set -x
13
case "$SYS" in
13
case "$SYS" in
14
   Linux*|*BSD*|GNU*)
14
   Linux*|*BSD*|GNU*)
15
      $CC -shared -o $LIBNAME -fPIC "$@";;
15
      $CC -shared -o $LIBNAME $CFLAGS $LDFLAGS -fPIC "$@";;
16
   CYGWIN*)
16
   CYGWIN*)
17
      # move the win32 import library for iconx.exe callbacks
17
      # move the win32 import library for iconx.exe callbacks
18
      # created when iconx.exe was built
18
      # created when iconx.exe was built
19
-- icon-v951src/ipl/packs/loadfunc/Makefile
19
++ icon-v951src/ipl/packs/loadfunc/Makefile
Lines 28-34 Link Here
28
		echo '$$define FUNCLIB "./$(FUNCLIB)"'	>libnames.icn
28
		echo '$$define FUNCLIB "./$(FUNCLIB)"'	>libnames.icn
29
29
30
$(FUNCLIB):	$(FUNCS)
30
$(FUNCLIB):	$(FUNCS)
31
		CC="$(CC)" CFLAGS="$(CFLAGS)" BIN="../../../bin" \
31
		CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" BIN="../../../bin" \
32
			sh $(MKLIB) $(FUNCLIB) $(FUNCS)
32
			sh $(MKLIB) $(FUNCLIB) $(FUNCS)
33
33
34
34
35
-- icon-v951src/src/common/Makefile
35
++ icon-v951src/src/common/Makefile
Lines 8-14 Link Here
8
common:		$(OBJS) gpxmaybe
8
common:		$(OBJS) gpxmaybe
9
9
10
patchstr:	patchstr.c
10
patchstr:	patchstr.c
11
		$(CC) $(CFLAGS) -o patchstr patchstr.c
11
		$(CC) $(CFLAGS) $(LDFLAGS) -o patchstr patchstr.c
12
12
13
gpxmaybe:
13
gpxmaybe:
14
		-if [ "x$(XL)" != "x" ]; then $(MAKE) $(GDIR); fi
14
		-if [ "x$(XL)" != "x" ]; then $(MAKE) $(GDIR); fi
Lines 25-31 Link Here
25
	  ../h/typedefs.h ../h/mproto.h ../h/cpuconf.h
25
	  ../h/typedefs.h ../h/mproto.h ../h/cpuconf.h
26
26
27
../h/arch.h:	infer.c
27
../h/arch.h:	infer.c
28
		$(CC) $(CFLAGS) -o infer infer.c
28
		$(CC) $(CFLAGS) $(LDFLAGS) -o infer infer.c
29
		./infer >../h/arch.h
29
		./infer >../h/arch.h
30
30
31
identify.o: ../h/version.h
31
identify.o: ../h/version.h
32
-- icon-v951src/src/rtt/Makefile
32
++ icon-v951src/src/rtt/Makefile
Lines 22-28 Link Here
22
22
23
23
24
rtt:	$(OBJ)
24
rtt:	$(OBJ)
25
	$(CC) $(LDFLAGS) -o rtt $(OBJ)
25
	$(CC) $(CFLAGS) $(LDFLAGS) -o rtt $(OBJ)
26
26
27
library:	$(OBJ)
27
library:	$(OBJ)
28
		rm -rf rtt.a
28
		rm -rf rtt.a
29
-- icon-v951src/src/runtime/Makefile
29
++ icon-v951src/src/runtime/Makefile
Lines 30-36 Link Here
30
30
31
iconx: $(COBJS) $(XOBJS)
31
iconx: $(COBJS) $(XOBJS)
32
	cd ../common; $(MAKE)
32
	cd ../common; $(MAKE)
33
	$(CC) $(RLINK) -o iconx $(XOBJS) $(COBJS) $(XL) $(RLIBS) $(TLIBS)
33
	$(CC) $(CFLAGS) $(LDFLAGS) $(RLINK) -o iconx $(XOBJS) $(COBJS) $(XL) $(RLIBS) $(TLIBS)
34
	cp iconx ../../bin
34
	cp iconx ../../bin
35
	strip $(SFLAGS) ../../bin/iconx$(EXE)
35
	strip $(SFLAGS) ../../bin/iconx$(EXE)
36
36

Return to bug 500698