Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/libtommath/patches/libtommath-0.42.0-build-fixes.patch

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

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 1315 by niro, Fri May 6 18:05:09 2011 UTC revision 1316 by niro, Fri May 6 18:19:57 2011 UTC
    # Line 1  Line 1 
    1  diff -NrU5 libtommath-0.41.original/makefile.shared libtommath-0.41/makefile.shared  diff -Naur libtommath-0.42.0/makefile.shared libtommath-0.42.0-magellan/makefile.shared
    2  --- libtommath-0.41.original/makefile.shared 2009-07-28 21:59:47.000000000 -0600  --- libtommath-0.42.0/makefile.shared 2010-07-23 16:27:20.000000000 +0200
    3  +++ libtommath-0.41/makefile.shared 2009-07-28 22:01:32.000000000 -0600  +++ libtommath-0.42.0-magellan/makefile.shared 2011-05-06 19:41:29.000000000 +0200
    4  @@ -1,11 +1,11 @@  @@ -3,7 +3,7 @@
      #Makefile for GCC  
      #  
    5   #Tom St Denis   #Tom St Denis
    6   VERSION=0:41   VERSION=0:41
    7    
    # Line 12  diff -NrU5 libtommath-0.41.original/make Line 10  diff -NrU5 libtommath-0.41.original/make
    10    
    11   CFLAGS  +=  -I./ -Wall -W -Wshadow -Wsign-compare   CFLAGS  +=  -I./ -Wall -W -Wshadow -Wsign-compare
    12    
    13   ifndef IGNORE_SPEED  @@ -82,21 +82,24 @@
       
     @@ -80,23 +80,26 @@  
      bn_mp_init_set_int.o bn_mp_invmod_slow.o bn_mp_prime_rabin_miller_trials.o \  
      bn_mp_to_signed_bin_n.o bn_mp_to_unsigned_bin_n.o  
    14    
    15   objs: $(OBJECTS)   objs: $(OBJECTS)
    16    
    # Line 24  diff -NrU5 libtommath-0.41.original/make Line 18  diff -NrU5 libtommath-0.41.original/make
    18  + $(LTCOMPILE) $(CFLAGS) $(LDFLAGS) -o $@ -c $<  + $(LTCOMPILE) $(CFLAGS) $(LDFLAGS) -o $@ -c $<
    19  +  +
    20   $(LIBNAME):  $(OBJECTS)   $(LIBNAME):  $(OBJECTS)
     - libtool --mode=link --tag=CC gcc $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)  
     + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)  
       
      install: $(LIBNAME)  
      install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)  
      libtool --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)  
      install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)  
      install -m 644 -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)  
       
      test: $(LIBNAME) demo/demo.o  
     - gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o  
     - libtool --mode=link gcc $(LDFLAGS) -o test demo/demo.o $(LIBNAME_S)  
     + $(CC) $(CFLAGS) -c demo/demo.c -o demo/demo.o  
     + libtool --mode=link $(CC) $(LDFLAGS) -o test demo/demo.o $(LIBNAME_S)  
       
      mtest: test  
     - cd mtest ; gcc $(CFLAGS) $(LDFLAGS) mtest.c -o mtest  
     + cd mtest ; $(CC) $(CFLAGS) $(LDFLAGS) mtest.c -o mtest  
               
      timing: $(LIBNAME)  
     - libtool --mode=link gcc $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest  
     + libtool --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest  
     --- makefile.shared.old 2007-03-11 00:45:11.000000000 +0100  
     +++ makefile.shared 2007-11-06 17:21:45.000000000 +0100  
     @@ -83,20 +83,20 @@  
      objs: $(OBJECTS)  
       
      $(LIBNAME):  $(OBJECTS)  
    21  - libtool --mode=link gcc *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)  - libtool --mode=link gcc *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
    22  + libtool --mode=link --tag=CC gcc $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)  + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
    23    
    24   install: $(LIBNAME)   install: $(LIBNAME)
    25   install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)   install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
    # Line 63  diff -NrU5 libtommath-0.41.original/make Line 29  diff -NrU5 libtommath-0.41.original/make
    29  + install -m 644 -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)  + install -m 644 -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
    30    
    31   test: $(LIBNAME) demo/demo.o   test: $(LIBNAME) demo/demo.o
    32   gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o  - gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o
    33  - libtool --mode=link gcc -o test demo/demo.o $(LIBNAME_S)  - libtool --mode=link gcc -o test demo/demo.o $(LIBNAME_S)
    34  + libtool --mode=link gcc $(LDFLAGS) -o test demo/demo.o $(LIBNAME_S)  + $(CC) $(CFLAGS) -c demo/demo.c -o demo/demo.o
    35    + libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o test demo/demo.o $(LIBNAME_S)
    36    
    37   mtest: test   mtest: test
    38  - cd mtest ; gcc $(CFLAGS) mtest.c -o mtest  - cd mtest ; gcc $(CFLAGS) mtest.c -o mtest
    39  + cd mtest ; gcc $(CFLAGS) $(LDFLAGS) mtest.c -o mtest  + cd mtest ; $(CC) $(CFLAGS) $(LDFLAGS) mtest.c -o mtest
    40                    
    41   timing: $(LIBNAME)   timing: $(LIBNAME)
    42  - gcc $(CFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest  - gcc $(CFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest
    43  + libtool --mode=link gcc $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest  + libtool --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest
    Legend:
    Removed from v.1315  
    changed lines
      Added in v.1316