Re: (lang/python27) Problems with OpenSSL search path on MirBSD

[Benny Siegert <bsiegert%gmail.com@localhost>]

On Sun, Mar 23, 2014 at 12:10 PM, Benny Siegert <bsiegert%gmail.com@localhost> 
wrote:
> Hi!
>
> In my current bulk build, the build of python27 is failing due to some
> extra files in lib-dynload (_sha256.so and _sha512.so). AFAICS, they
> are built if the OpenSSL version is too old. However, the build is
> supposed to use OpenSSL from pkgsrc:
>
> $ bmake show-var VARNAME=USE_BUILTIN.openssl
> no
>
> I added a little print debugging to setup.py and get:
>
> **** opensslv_h = ['/usr/include']
> **** openssl_ver = 0x9070df
>
> ... which is the builtin OpenSSL. Any ideas on why it is not picking
> up the opensslv.h from the buildlink path (which is there, I checked)?

For some reason, BUILDLINK_DIR is not added to MAKE_ENV. And the code
in setup.py prepends (instead of appending) /usr/include again, so
that the wrong openssl headers are found.

I prepared a patch (see attached). OK to commit?

--Benny.

? work
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python27/Makefile,v
retrieving revision 1.37
diff -u -d -r1.37 Makefile
--- Makefile    12 Mar 2014 12:40:57 -0000      1.37
+++ Makefile    23 Mar 2014 11:43:21 -0000
@@ -48,6 +48,8 @@
 # fdatasync()
 LIBS.SunOS+=           -lrt
 
+MAKE_ENV+=             BUILDLINK_DIR=${BUILDLINK_DIR:Q}
+
 PY_VER_SUFFIX=         2.7
 
 PLIST_SRC=     ${.CURDIR}/../../lang/python27/PLIST.common
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python27/distinfo,v
retrieving revision 1.32
diff -u -d -r1.32 distinfo
--- distinfo    15 Mar 2014 05:38:14 -0000      1.32
+++ distinfo    23 Mar 2014 11:43:21 -0000
@@ -16,7 +16,7 @@
 SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
 SHA1 (patch-ah) = ae3ce0656d890ca34292920bf0185f94ba847139
 SHA1 (patch-al) = dd8bed847f797b97df1a9ad7ffe17645b0f08925
-SHA1 (patch-am) = e5d78bfd5b9e6339985ed4cb587897042b6b8590
+SHA1 (patch-am) = c19a6b33d58a695d13f33cca2d27d7b1c67959e0
 SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
 SHA1 (patch-ao) = 3a1cd2b255340fd23fc1fce8680e692581ffcec1
 SHA1 (patch-au) = 2a2a988ac92553d17eb898870d1adb3c30a59b66
Index: patches/patch-am
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python27/patches/patch-am,v
retrieving revision 1.12
diff -u -d -r1.12 patch-am
--- patches/patch-am    12 Mar 2014 12:40:57 -0000      1.12
+++ patches/patch-am    23 Mar 2014 11:43:21 -0000
@@ -23,7 +23,7 @@
 
 --- setup.py.orig      2013-11-10 07:36:41.000000000 +0000
 +++ setup.py
-@@ -33,7 +33,7 @@ host_platform = get_platform()
+@@ -33,14 +33,14 @@ host_platform = get_platform()
  COMPILED_WITH_PYDEBUG = ('--with-pydebug' in 
sysconfig.get_config_var("CONFIG_ARGS"))
  
  # This global variable is used to hold the list of modules to be disabled.
@@ -31,7 +31,16 @@
 +disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", 
"_sqlite3", "_tkinter", "gdbm", "pyexpat", "readline", "linuxaudiodev", 
"ossaudiodev", "spwd", "sunaudiodev"]
  
  def add_dir_to_list(dirlist, dir):
-     """Add the directory 'dir' to the list 'dirlist' (at the front) if
+-    """Add the directory 'dir' to the list 'dirlist' (at the front) if
++    """Add the directory 'dir' to the list 'dirlist' (at the back) if
+     1) 'dir' is not already in 'dirlist'
+     2) 'dir' actually exists, and is a directory."""
+     if dir is not None and os.path.isdir(dir) and dir not in dirlist:
+-        dirlist.insert(0, dir)
++        dirlist.append(dir)
+ 
+ def macosx_sdk_root():
+     """
 @@ -436,10 +436,15 @@ class PyBuildExt(build_ext):
              os.unlink(tmpfile)