gopy,bind: add -fPIC --shared, use Windows-friendly pkg-config

Author: sbinet

bind/gen.go

@@ -46,7 +46,7 @@ File is generated by gopy. Do not edit.
 package main
 
 /*
-#cgo pkg-config: %[3]s
+%[3]s
 // #define Py_LIMITED_API // need full API for PyRun*
 #include <Python.h>
 typedef uint8_t bool;
@@ -268,13 +268,12 @@ GOCMD=go
 GOBUILD=$(GOCMD) build
 GOIMPORTS=goimports
 PYTHON=%[4]s
-PYTHON_CFG=$(PYTHON)-config
 LIBEXT=%[5]s
 
 # get the CC and flags used to build python:
 GCC = $(shell $(GOCMD) env CC)
-CFLAGS = $(shell $(PYTHON_CFG) --cflags)
-LDFLAGS = $(shell $(PYTHON_CFG) --ldflags)
+CFLAGS = %[7]s
+LDFLAGS = %[8]s
 
 all: gen build
 
@@ -294,7 +293,7 @@ build:
 	$(PYTHON) build.py
 	# build the _%[1]s$(LIBEXT) library that contains the cgo and CPython wrappers
 	# generated %[1]s.py python wrapper imports this c-code package
-	$(GCC) %[1]s.c %[6]s %[1]s_go$(LIBEXT) -o _%[1]s$(LIBEXT) $(CFLAGS) $(LDFLAGS) -w
+	$(GCC) %[1]s.c %[6]s %[1]s_go$(LIBEXT) -o _%[1]s$(LIBEXT) $(CFLAGS) $(LDFLAGS) -fPIC --shared -w
 	
 `
 
@@ -307,13 +306,12 @@ GOCMD=go
 GOBUILD=$(GOCMD) build
 GOIMPORTS=goimports
 PYTHON=%[4]s
-PYTHON_CFG=$(PYTHON)-config
 LIBEXT=%[5]s
+CFLAGS = %[6]s
+LDFLAGS = %[7]s
 
 # get the flags used to build python:
 GCC = $(shell $(GOCMD) env CC)
-CFLAGS = $(shell $(PYTHON_CFG) --cflags)
-LDFLAGS = $(shell $(PYTHON_CFG) --ldflags)
 
 all: gen build
 
@@ -476,9 +474,19 @@ func (g *pyGen) genGoPreamble() {
 	for pi, _ := range current.imports {
 		pkgimport += fmt.Sprintf("\n\t%q", pi)
 	}
-	pypath, pyonly := filepath.Split(g.vm)
-	pyroot, _ := filepath.Split(filepath.Clean(pypath))
-	libcfg := filepath.Join(filepath.Join(filepath.Join(pyroot, "lib"), "pkgconfig"), pyonly+".pc")
+	libcfg := func() string {
+		pycfg, err := getPythonConfig(g.vm)
+		if err != nil {
+			panic(err)
+		}
+		pkgcfg := fmt.Sprintf(`
+#cgo CFLAGS: %s
+#cgo LDFLAGS: %s
+`, pycfg.cflags, pycfg.ldflags)
+
+		return pkgcfg
+	}()
+
 	if g.mode == ModeExe && g.mainstr == "" {
 		g.mainstr = "GoPyMainRun()" // default is just to run main
 	}
@@ -549,10 +557,16 @@ func CmdStrToMakefile(cmdstr string) string {
 func (g *pyGen) genMakefile() {
 	gencmd := strings.Replace(g.cmdstr, "gopy build", "gopy gen", 1)
 	gencmd = CmdStrToMakefile(gencmd)
+
+	pycfg, err := getPythonConfig(g.vm)
+	if err != nil {
+		panic(err)
+	}
+
 	if g.mode == ModeExe {
-		g.makefile.Printf(MakefileExeTemplate, g.outname, g.cmdstr, gencmd, g.vm, g.libext)
+		g.makefile.Printf(MakefileExeTemplate, g.outname, g.cmdstr, gencmd, g.vm, g.libext, pycfg.cflags, pycfg.ldflags)
 	} else {
-		g.makefile.Printf(MakefileTemplate, g.outname, g.cmdstr, gencmd, g.vm, g.libext, g.extraGccArgs)
+		g.makefile.Printf(MakefileTemplate, g.outname, g.cmdstr, gencmd, g.vm, g.libext, g.extraGccArgs, pycfg.cflags, pycfg.ldflags)
 	}
 }
 

cmd_build.go

@@ -191,6 +191,18 @@ func runBuild(mode bind.BuildMode, odir, outname, cmdstr, vm, mainstr string, sy
 		gccargs := []string{outname + ".c", extraGccArgs, outname + "_go" + libExt, "-o", modlib}
 		gccargs = append(gccargs, strings.Split(strings.TrimSpace(string(cflags)), " ")...)
 		gccargs = append(gccargs, strings.Split(strings.TrimSpace(string(ldflags)), " ")...)
+		gccargs = append(gccargs, "-fPIC", "--shared")
+
+		gccargs = func(vs []string) []string {
+			o := make([]string, 0, len(gccargs))
+			for _, v := range vs {
+				if v == "" {
+					continue
+				}
+				o = append(o, v)
+			}
+			return o
+		}(gccargs)
 
 		fmt.Printf("%s %v\n", cccmd, strings.Join(gccargs, " "))
 		cmd = exec.Command(cccmd, gccargs...)