gdmodule: don't use /sw and /usr/local paths

[jdemeyer]

The gdmodule spkg should not use /sw/include as include path, as some Fink stuff there can interfere badly with Sage. Analogously, we shouldn't use /usr/local/include.

spkg: http://boxen.math.washington.edu/home/jdemeyer/spkg/gdmodule-0.56.p8.spkg
(diff)

gdmodule-0.56.p8 (Robert Bradshaw, Jeroen Demeyer, 6 May 2012)

• Trac gdmodule: don't use /sw and /usr/local paths #12909: Setup.py: don't use non-system prefixes
  /sw and /usr/local to look for include files or libraries.
• Use standard template for spkg-install, use patch for patching.
• Restore upstream sources. The pre-existing changes to src/Setup.py
  have been moved to Setup.py.patch
• _gdmodule.c: Undo change of #include <gd.h> to #include "gd.h"

Component: packages: standard

Author: Robert Bradshaw, Jeroen Demeyer

Reviewer: Volker Braun

Merged: sage-5.0.rc1

Issue created by migration from https://trac.sagemath.org/ticket/12909

[robertwb]

comment:1

New spkg up at http://sage.math.washington.edu/home/robertwb/patches/gdmodule-0.56.p8.spkg

[robertwb]

comment:2

robertwb-macbookpro:standard robertwb$ diff -u -r gdmodule-0.56.p7 gdmodule-0.56.p8 | grep -v '/.hg'
diff -u -r gdmodule-0.56.p7/patches/Setup.py gdmodule-0.56.p8/patches/Setup.py
--- gdmodule-0.56.p7/patches/Setup.py	2012-05-05 15:14:01.000000000 -0700
+++ gdmodule-0.56.p8/patches/Setup.py	2012-05-05 15:15:00.000000000 -0700
@@ -41,7 +41,7 @@
 
 libdirs = dirtest([
     os.environ["SAGE_LOCAL"]+"/lib",
-    "/usr/local/lib", "/sw/lib", "/usr/lib",
+    "/usr/local/lib", "/usr/lib",
     "/usr/lib/X11", "/usr/X11R6/lib",
     "/opt/gnome/lib",
 ])
@@ -51,7 +51,7 @@
 
 incdirs = dirtest([
     os.environ["SAGE_LOCAL"]+"/include",
-    "/usr/local/include", "/sw/include", "/usr/include",
+    "/usr/local/include", "/usr/include",
     "/usr/include/X11", "/usr/X11R6/include",
     "/opt/gnome/include",
 ])
diff -u -r gdmodule-0.56.p7/patches/Setup.py.patch gdmodule-0.56.p8/patches/Setup.py.patch
--- gdmodule-0.56.p7/patches/Setup.py.patch	2012-05-05 15:14:01.000000000 -0700
+++ gdmodule-0.56.p8/patches/Setup.py.patch	2012-05-05 15:15:46.000000000 -0700
@@ -1,5 +1,23 @@
---- ../src/Setup.py	2007-01-10 10:23:03.000000000 -0800
-+++ Setup.py	2010-04-06 11:16:30.316434351 -0700
+--- ../src/Setup.py	2012-05-05 15:14:14.000000000 -0700
++++ Setup.py	2012-05-05 15:15:00.000000000 -0700
+@@ -41,7 +41,7 @@
+ 
+ libdirs = dirtest([
+     os.environ["SAGE_LOCAL"]+"/lib",
+-    "/usr/local/lib", "/sw/lib", "/usr/lib",
++    "/usr/local/lib", "/usr/lib",
+     "/usr/lib/X11", "/usr/X11R6/lib",
+     "/opt/gnome/lib",
+ ])
+@@ -51,7 +51,7 @@
+ 
+ incdirs = dirtest([
+     os.environ["SAGE_LOCAL"]+"/include",
+-    "/usr/local/include", "/sw/include", "/usr/include",
++    "/usr/local/include", "/usr/include",
+     "/usr/include/X11", "/usr/X11R6/include",
+     "/opt/gnome/include",
+ ])
 @@ -61,13 +61,12 @@
  import os
  if os.uname()[0][:6] == "CYGWIN":

[jdemeyer]

Author: Robert Bradshaw, Jeroen Demeyer

[jdemeyer]

comment:4

I did some further clean-up of the SPKG, needs review.

[vbraun]

comment:7

Looks good to me. Positive review if you commit the changes...

[jdemeyer]

comment:8

Replying to @vbraun:

Looks good to me. Positive review if you commit the changes...

Done.

[jdemeyer]

Reviewer: Volker Braun

[dimpase]

comment:10

libdirs field in setup.py still has /usr/local/lib in it.
Is it on purpose?

[jdemeyer]

comment:11

Replying to @dimpase:

libdirs field in setup.py still has /usr/local/lib in it.
Is it on purpose?

No, that's a mistake.

[jdemeyer]

Attachment: gdmodule-0.56.p7-p8.diff.gz

[jdemeyer]

comment:12

Fixed.

[jdemeyer]

Merged: sage-5.0.rc1