File ns3-3.17-pkg_config.patch of Package ns3

Overview Repositories Revisions Requests Users Attributes Meta

File ns3-3.17-pkg_config.patch of Package ns3

Index: src/wscript
===================================================================
--- src/wscript.orig
+++ src/wscript
@@ -334,14 +334,10 @@ class ns3pcfile_task(Task.Task):
         if env['ENABLE_STATIC_NS3']:
             path_st = 'STLIBPATH_ST'
             lib_st = 'STLIB_ST'
-            lib_marker = 'STLIB_MARKER'
         else:
             path_st = 'LIBPATH_ST'
             lib_st = 'LIB_ST'
-            lib_marker = 'SHLIB_MARKER'
-        retval = [env[path_st] % libdir]
-        if env[lib_marker]:
-            retval.append(env[lib_marker])
+        retval = [env[path_st] % '${libdir}']
         retval.append(env[lib_st] % name)
         return retval
 
@@ -383,15 +379,9 @@ class ns3pcfile_task(Task.Task):
         includedir = Utils.subst_vars('${INCLUDEDIR}/%s%s' % (wutils.APPNAME, wutils.VERSION), env)
         libdir = env.LIBDIR
         libs = self._self_libs(env, "%s%s-%s%s" % (wutils.APPNAME, wutils.VERSION, name[4:], env.BUILD_SUFFIX), '${libdir}')
-        for dep in use:
-            libs += self._lib(env, dep)
-        for dep in env.LIBS:
-            libs += self.env['LIB_ST'] % dep
         cflags = [self.env['CPPPATH_ST'] % '${includedir}']
         requires = []
         for dep in use:
-            cflags = cflags + self._cflags(dep) + self._cxxflags(dep) + \
-                self._defines(dep) + self._includes(dep)
             if dep.startswith('ns3-'):
                 dep_name = dep[4:]
                 requires.append("libns%s-%s%s" % (wutils.VERSION, dep_name, env.BUILD_SUFFIX))
@@ -405,7 +395,7 @@ Description: ns-3 module %s
 Version: %s
 Libs: %s
 Cflags: %s
-Requires: %s\
+Requires.private: %s\
 """ % (prefix, libdir, includedir,
        name, name, wutils.VERSION, ' '.join(libs), ' '.join(cflags), ' '.join(requires))
         outfile.close()

Places

File ns3-3.17-pkg_config.patch of Package ns3

Places