Changeset 283

Timestamp:

08/07/15 18:02:48 (9 years ago)

Author:

tim

Message:

attempting to address outstanding packaging issues

Location:

trunk

Files:

• SConstruct (modified) (4 diffs)
• regfi_version.py (modified) (1 diff)

trunk/SConstruct

@@ +1 @@
+#-*- mode: Python;-*-
+
 import sys
 import os
 sys.dont_write_bytecode = True
 from regfi_version import REGFI_VERSION
+ABI_VERSION=REGFI_VERSION.rsplit('.',1)[0]
 
-# Package Maintainers: should any of these options be omitted during package
-# build, instead relying on CFLAGS/LDFLAGS to specify them when appropriate?
+# Package Maintainers: should any of these options in the first line be omitted during
+# package build, instead relying on CFLAGS/LDFLAGS to specify them when appropriate?
 cflags = '-std=gnu99 -pedantic -Wall -D_FILE_OFFSET_BITS=64 -fvisibility=hidden'
 cflags += ' -DREGFI_VERSION=\'"%s"\' ' % REGFI_VERSION
 cflags += os.environ.get('CFLAGS','-fPIE -pie -fstack-protector -D_FORTIFY_SOURCE=2')
 
-linkflags = "-shared -fPIC -Wl,-soname,libregfi.so.%s " % REGFI_VERSION
-linkflags += os.environ.get('LDFLAGS','-z relro -z now')
-
+linkflags = "-fPIC " + os.environ.get('LDFLAGS',"-Wl,-z,relro,-z,now")
 
 lib_src = ['lib/regfi.c',
@@ -24 +25 @@
                   CC=cc,
                   CFLAGS=cflags,
+                  LINKFLAGS=linkflags,
                   CPPPATH=['include', '/usr/local/include'],
                   LIBPATH=['lib', '/usr/local/lib'],
@@ -32 +34 @@
 libregfi_static = env.Library(lib_src)
 libregfi = env.SharedLibrary(lib_src, LIBS=['m','pthread', 'talloc'], 
-                             LINKFLAGS=linkflags)
+                             SHLIBVERSION=ABI_VERSION)
 
 
@@ -65 +67 @@
 
 env.Install(destdir+bindir, [reglookup, reglookup_recover, 'bin/reglookup-timeline'])
-libinstall = env.Install(destdir+libdir, [libregfi, libregfi_static])
+libinstall = env.InstallVersionedLib(destdir+libdir, [libregfi, libregfi_static], SHLIBVERSION=ABI_VERSION)
 env.Install(destdir+includedir+'/regfi', Glob('include/*.h'))
 env.Install(destdir+mandir+'/man1', [man_reglookup, man_reglookup_recover,

trunk/regfi_version.py

@@ -1 +1 @@
 SVN_REV = "$Rev$"
-REGFI_VERSION = "99.99.99.%s" % SVN_REV.split(' ')[1]
+LATEST='1.0.1'
+REGFI_VERSION = "%s.%s" % (LATEST, SVN_REV.split(' ')[1])