Ticket #13341: spkg.diff

File spkg.diff, 1.8 KB (added by jpflori, 9 years ago)

Spkg diff, for review only.

  • .hgtags

    diff --git a/.hgtags b/.hgtags
    a b  
    1169ff80a88c52d1685aedc9e02ce8281b449c429d gap-4.4.12.p5
    22654904afbf67fd1b8e86c0e916e6988b02d8d449 gap-4.4.12.p6
    33d6226c94f81ba51f9852848bda1f6516a41da4a5 gap-4.4.12.p7
     438d3a93b69d4e2f1766b72e44302846514cf5d55 gap-4.4.12.p8
  • SPKG.txt

    diff --git a/SPKG.txt b/SPKG.txt
    a b  
    5555
    5656== Changelog ==
    5757
     58=== gap-4.4.12.p8 (Jean-Pierre Flori, 5 August 2012) ===
     59 * #13341: Do not fail when old trick for Cygwin does.
     60
    5861=== gap-4.4.12.p7 (Leif Leonhardy, March 22nd 2012) ===
    5962 * #7041: Only unset `CC` and `CXX` if really necessary (i.e., if they
    6063   contain spaces, which is what currently would break the build).
  • spkg-install

    diff --git a/spkg-install b/spkg-install
    a b  
    9595        exit 1
    9696    fi
    9797
    98     # On a Windows machine the GAP build creates a file "gap.exe",
    99     # but no file named "gap".  This breaks the build, since it
    100     # then tries to strip gap, but can't since the file is missing!
     98    # On old Cygwin installations the GAP build creates a file "gap.exe",
     99    # but no file named "gap".  This broke the build, since it
     100    # then tried to strip gap, but couldn't since the file is missing!
     101    # Recent Cygwin installations automatically transalate "gap" to
     102    # "gap.exe", so the below procedure will fail but should not be blocking.
    101103    if [[ "$UNAME" = CYGWIN ]]; then
    102104        mkdir -p bin/i686-pc-cygwin-gcc &&
    103105        cd bin/i686-pc-cygwin-gcc &&
     
    105107        ln -s gap.exe gap
    106108        if [[ $? -ne 0 ]]; then
    107109            echo >&2 "Error creating dummy 'gap.exe' and/or a link from 'gap' to it."
    108             exit 1
     110            echo >&2 "Hopefully, this is just because the Cygwin install is recent enough."
     111            #exit 1
    109112        fi
    110113        cd ../..
    111114    fi