Changeset 283


Ignore:
Timestamp:
08/07/15 18:02:48 (9 years ago)
Author:
tim
Message:

attempting to address outstanding packaging issues

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/SConstruct

    r282 r283  
     1#-*- mode: Python;-*-
     2
    13import sys
    24import os
    35sys.dont_write_bytecode = True
    46from regfi_version import REGFI_VERSION
     7ABI_VERSION=REGFI_VERSION.rsplit('.',1)[0]
    58
    6 # Package Maintainers: should any of these options be omitted during package
    7 # build, instead relying on CFLAGS/LDFLAGS to specify them when appropriate?
     9# Package Maintainers: should any of these options in the first line be omitted during
     10# package build, instead relying on CFLAGS/LDFLAGS to specify them when appropriate?
    811cflags = '-std=gnu99 -pedantic -Wall -D_FILE_OFFSET_BITS=64 -fvisibility=hidden'
    912cflags += ' -DREGFI_VERSION=\'"%s"\' ' % REGFI_VERSION
    1013cflags += os.environ.get('CFLAGS','-fPIE -pie -fstack-protector -D_FORTIFY_SOURCE=2')
    1114
    12 linkflags = "-shared -fPIC -Wl,-soname,libregfi.so.%s " % REGFI_VERSION
    13 linkflags += os.environ.get('LDFLAGS','-z relro -z now')
    14 
     15linkflags = "-fPIC " + os.environ.get('LDFLAGS',"-Wl,-z,relro,-z,now")
    1516
    1617lib_src = ['lib/regfi.c',
     
    2425                  CC=cc,
    2526                  CFLAGS=cflags,
     27                  LINKFLAGS=linkflags,
    2628                  CPPPATH=['include', '/usr/local/include'],
    2729                  LIBPATH=['lib', '/usr/local/lib'],
     
    3234libregfi_static = env.Library(lib_src)
    3335libregfi = env.SharedLibrary(lib_src, LIBS=['m','pthread', 'talloc'],
    34                              LINKFLAGS=linkflags)
     36                             SHLIBVERSION=ABI_VERSION)
    3537
    3638
     
    6567
    6668env.Install(destdir+bindir, [reglookup, reglookup_recover, 'bin/reglookup-timeline'])
    67 libinstall = env.Install(destdir+libdir, [libregfi, libregfi_static])
     69libinstall = env.InstallVersionedLib(destdir+libdir, [libregfi, libregfi_static], SHLIBVERSION=ABI_VERSION)
    6870env.Install(destdir+includedir+'/regfi', Glob('include/*.h'))
    6971env.Install(destdir+mandir+'/man1', [man_reglookup, man_reglookup_recover,
  • trunk/regfi_version.py

    r277 r283  
    11SVN_REV = "$Rev$"
    2 REGFI_VERSION = "99.99.99.%s" % SVN_REV.split(' ')[1]
     2LATEST='1.0.1'
     3REGFI_VERSION = "%s.%s" % (LATEST, SVN_REV.split(' ')[1])
Note: See TracChangeset for help on using the changeset viewer.