Ticket #11645: singular-3-1-1-4.p11-p12.diff

File singular-3-1-1-4.p11-p12.diff, 2.7 KB (added by jdemeyer, 10 years ago)

Diff for the Singular spkg, for reviewers

  • SPKG.txt 

    diff -r 7f9b12abe20d SPKG.txt
    a b  
    4242
    4343== ChangeLog ==
    4444
     45=== singular-3-1-1-4.p12 (Jeroen Demeyer, 9 August 2011) ===
     46 * Trac #11645: Fix installation of gftables on Solaris
     47   by applying an upstream patch to Singular/Makefile.in
     48
    4549=== singular-3-1-1-4.p11 (Jeroen Demeyer, 9 August 2011) ===
    4650 * Trac #11663: Make all files world-readable
    4751 * Use `cp -p` in spkg-install to preserve permissions

  • patches/Singular-Makefile.in 

    diff -r 7f9b12abe20d patches/Singular-Makefile.in
    a b  
    548548          ${INSTALL_DATA}  $$file ${slibdir}; \
    549549        done
    550550        ${MKINSTALLDIRS} ${slibdir}/gftables
    551         ${INSTALL_DATA} `pwd`/LIB/gftables/* ${slibdir}/gftables/
     551        for file in `pwd`/LIB/gftables/*; do \
     552          ${INSTALL_DATA}  $$file ${slibdir}/gftables/; \
     553        done
    552554
    553555install-libsingular: libsingular
    554556        ${MKINSTALLDIRS} ${includedir}/singular

  • patches/Singular-Makefile.in.patch 

    diff -r 7f9b12abe20d patches/Singular-Makefile.in.patch
    a b  
    1 --- ../src/Singular/Makefile.in 2010-07-15 12:19:00.000000000 +0200
    2 +++ Singular-Makefile.in        2010-09-09 09:36:53.975341044 +0200
     1--- src.old/Singular/Makefile.in        2010-07-15 12:19:00.000000000 +0200
     2+++ src/Singular/Makefile.in    2011-08-09 19:05:42.000000000 +0200
    33@@ -377,7 +377,7 @@
    44 claptmpl.o: claptmpl.cc mod2.h
    55        ${CXX} ${CXXFLAGS}  ${CPPFLAGS} ${DEFS} -c $<
    … …  
    1818                           ipconv.cc tok.h mpsr_Tok.cc grammar.h mod2.h
    1919        ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} -DGENTABLE \
    2020             -o gentable2 claptmpl.o iparith.cc tesths.cc mpsr_Tok.cc \
     21@@ -548,7 +548,9 @@
     22          ${INSTALL_DATA}  $$file ${slibdir}; \
     23        done
     24        ${MKINSTALLDIRS} ${slibdir}/gftables
     25-       ${INSTALL_DATA} `pwd`/LIB/gftables/* ${slibdir}/gftables/
     26+       for file in `pwd`/LIB/gftables/*; do \
     27+         ${INSTALL_DATA}  $$file ${slibdir}/gftables/; \
     28+       done
     29 
     30 install-libsingular: libsingular
     31        ${MKINSTALLDIRS} ${includedir}/singular

  • spkg-install 

    diff -r 7f9b12abe20d spkg-install
    a b  
    118118
    119119    # parallel build patches
    120120    cp patches/factory-GNUmakefile.in src/factory/GNUmakefile.in
    121     cp patches/Singular-Makefile.in src/Singular/Makefile.in
     121    cp patches/Singular-Makefile.in src/Singular/Makefile.in     # Fixes also #11645
    122122    cp patches/kernel-Makefile.in src/kernel/Makefile.in
    123123    cp patches/libfac-Makefile.in src/libfac/Makefile.in
    124124    cp patches/Makefile.in src/Makefile.in