Magellan Linux

Annotation of /trunk/libtommath/patches/libtommath-0.42.0-build-fixes.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1317 - (hide annotations) (download)
Fri May 6 18:25:38 2011 UTC (13 years ago) by niro
File size: 2001 byte(s)
fixed patch
1 niro 1316 diff -Naur libtommath-0.42.0/makefile.shared libtommath-0.42.0-magellan/makefile.shared
2     --- libtommath-0.42.0/makefile.shared 2010-07-23 16:27:20.000000000 +0200
3 niro 1317 +++ libtommath-0.42.0-magellan/makefile.shared 2011-05-06 19:52:47.000000000 +0200
4 niro 1316 @@ -3,7 +3,7 @@
5 niro 1315 #Tom St Denis
6     VERSION=0:41
7    
8     -CC = libtool --mode=compile --tag=CC gcc
9     +LTCOMPILE = libtool --mode=compile --tag=CC $(CC)
10    
11     CFLAGS += -I./ -Wall -W -Wshadow -Wsign-compare
12    
13 niro 1317 @@ -20,19 +20,6 @@
14 niro 1315
15 niro 1317 endif
16    
17     -#install as this user
18     -ifndef INSTALL_GROUP
19     - GROUP=wheel
20     -else
21     - GROUP=$(INSTALL_GROUP)
22     -endif
23     -
24     -ifndef INSTALL_USER
25     - USER=root
26     -else
27     - USER=$(INSTALL_USER)
28     -endif
29     -
30     default: libtommath.la
31    
32     #default files to install
33     @@ -82,21 +69,24 @@
34    
35 niro 1315 objs: $(OBJECTS)
36    
37     +.c.o:
38     + $(LTCOMPILE) $(CFLAGS) $(LDFLAGS) -o $@ -c $<
39     +
40     $(LIBNAME): $(OBJECTS)
41 niro 1316 - libtool --mode=link gcc *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
42 niro 1315 + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
43    
44     install: $(LIBNAME)
45 niro 1317 - install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
46     + install -d $(DESTDIR)$(LIBPATH)
47 niro 1315 libtool --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)
48 niro 1317 - install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
49 niro 1315 - install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
50 niro 1317 + install -d $(DESTDIR)$(INCPATH)
51     + install -m 644 $(HEADERS) $(DESTDIR)$(INCPATH)
52 niro 1315
53     test: $(LIBNAME) demo/demo.o
54 niro 1316 - gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o
55 niro 1315 - libtool --mode=link gcc -o test demo/demo.o $(LIBNAME_S)
56 niro 1316 + $(CC) $(CFLAGS) -c demo/demo.c -o demo/demo.o
57     + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o test demo/demo.o $(LIBNAME_S)
58 niro 1315
59     mtest: test
60     - cd mtest ; gcc $(CFLAGS) mtest.c -o mtest
61 niro 1316 + cd mtest ; $(CC) $(CFLAGS) $(LDFLAGS) mtest.c -o mtest
62 niro 1315
63     timing: $(LIBNAME)
64     - gcc $(CFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest
65 niro 1316 + libtool --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest