Turns out that all the mucking about with "ld -r" and "objcopy" wasn't

necessary, building OpenSSL with -fPIC and linking against static
libraries was enough.  So we probably could go back to using
distutils, but for now, we can get rid of the extraneous steps.

svn path=/pow/Makefile.in; revision=3608

1 files changed, 2 insertions, 27 deletions

diff --git a/pow/build.py b/pow/build.py
index 25b5533a..87f99db9 100644
--- a/pow/build.py
+++ b/pow/build.py
@@ -30,14 +30,6 @@ import os, subprocess, sys
 from distutils.sysconfig import (get_config_var as getvar,
                                  get_python_inc as getinc)
 
-static_libraries = []
-other_libraries = []
-for lib in os.environ["AC_LIBS"].split():
-  if lib.startswith("-"):
-    other_libraries.append(lib)
-  else:
-    static_libraries.append(lib)
-
 cmd = getvar("CC").split()
 cmd.extend(("-c", "-o", "POW.o", "POW.c"))
 cmd.extend(os.environ["AC_CFLAGS"].split())
@@ -50,29 +42,12 @@ r = subprocess.call(cmd)
 if r:
   sys.exit(r)
 
-if static_libraries:
-  cmd = ["ld", "-r", "-o", "_POW.o", "POW.o"] + static_libraries
-  print " ".join(cmd)
-  r = subprocess.call(cmd)
-  if r:
-    sys.exit(r)
-else:
-  os.link("POW.o", "_POW.o")
-
 cmd = getvar("LDSHARED").split()
-cmd.extend(("-o", "../rpkid/rpki/POW/_POW.so", "_POW.o"))
+cmd.extend(("-o", "../rpkid/rpki/POW/_POW.so", "POW.o"))
 cmd.extend(os.environ["AC_LDFLAGS"].split())
 cmd.extend(getvar("LDFLAGS").split())
-cmd.extend(other_libraries)
+cmd.extend(os.environ["AC_LIBS"].split())
 print " ".join(cmd)
 r = subprocess.call(cmd)
 if r:
   sys.exit(r)
-
-objcopy = os.getenv("AC_OBJCOPY")
-if objcopy:
-  cmd = [objcopy, "-G", "init_POW", "-x", "../rpkid/rpki/POW/_POW.so"]
-  print " ".join(cmd)
-  r = subprocess.call(cmd)
-  if r:
-    sys.exit(r)