Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
Please login to access the resource
openSUSE:Evergreen:11.4
zfs-fuse
zfs-fuse-0.6.9-fix-buildsystem.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File zfs-fuse-0.6.9-fix-buildsystem.patch of Package zfs-fuse
diff -urNp zfs-fuse-0.7.0.orig/src/lib/libumem/SConscript zfs-fuse-0.7.0/src/lib/libumem/SConscript --- zfs-fuse-0.7.0.orig/src/lib/libumem/SConscript 2011-03-09 16:22:30.000000000 +0100 +++ zfs-fuse-0.7.0/src/lib/libumem/SConscript 2011-03-10 12:15:14.000000000 +0100 @@ -1,7 +1,7 @@ import os Import('env') -Command("Makefile", [], ["cd lib/libumem && ./configure"]) +Command("Makefile", [], [env.subst("cd lib/libumem && CFLAGS=\"$CCFLAGS\" CPPFLAGS=\"$CPPFLAGS\" LDFLAGS=\"$LINKFLAGS\" ./configure").replace("-std=c99", "-std=gnu99")]) Command("libumem.a", [Glob('*.c'),'Makefile',Glob('*.h')], ["cd lib/libumem && make && rm -f libumem.a && ln -s .libs/libumem.a"]) if os.path.isfile("Makefile") and env.GetOption('clean'): Execute(Action(["make -C %s distclean" % (os.path.join(env.Dir("#").abspath, 'lib/libumem'))])) diff -urNp zfs-fuse-0.7.0.orig/src/lib/libzpool/vdev.c zfs-fuse-0.7.0/src/lib/libzpool/vdev.c --- zfs-fuse-0.7.0.orig/src/lib/libzpool/vdev.c 2011-03-09 16:22:30.000000000 +0100 +++ zfs-fuse-0.7.0/src/lib/libzpool/vdev.c 2011-03-10 12:15:14.000000000 +0100 @@ -43,6 +43,10 @@ #include <syslog.h> #include <libintl.h> +#ifndef LIBEXECDIR +#define LIBEXECDIR "/usr/lib" +#endif + /* * Virtual device management. */ @@ -3056,7 +3060,7 @@ vdev_set_state(vdev_t *vd, boolean_t iso return; // nothing of interest here } if (strcasecmp(top->spa_name,"$import")) { - snprintf(cmd,2048,"/etc/zfs/zfs_pool_alert %s &",top->spa_name); + snprintf(cmd,2048,LIBEXECDIR "/zfs_pool_alert %s &",top->spa_name); syslog(LOG_WARNING,"running zfs_pool_alert for pool %s, status %s prev status %s",top->spa_name,zpool_state_to_name(state,save_state), zpool_state_to_name(save_state,state)); int ret = system(cmd); diff -urNp zfs-fuse-0.7.0.orig/src/SConstruct zfs-fuse-0.7.0/src/SConstruct --- zfs-fuse-0.7.0.orig/src/SConstruct 2011-03-09 16:22:30.000000000 +0100 +++ zfs-fuse-0.7.0/src/SConstruct 2011-03-10 12:57:49.000000000 +0100 @@ -22,6 +22,7 @@ def arg_get(name, default): install_dir = arg_get('install_dir', '/usr/local/sbin') man_dir = arg_get('man_dir', '/usr/local/share/man/man8/') cfg_dir = arg_get('cfg_dir', '/etc/zfs') +libexec_dir = arg_get('libexec_dir', '/usr/local/lib/zfs-fuse') env = Environment() @@ -30,8 +31,13 @@ osname = f.readline().strip() f.close() env.CacheDir('/tmp/.zfs-fuse.scons') -env['CC'] = 'gcc' +if 'CC' in os.environ: + env['CC'] = os.environ['CC'] +else: + env['CC'] = 'gcc' env['LINKFLAGS'] = Split('-pipe -Wall') +if 'LDFLAGS' in os.environ: + env.Append(LINKFLAGS = " "+os.environ['LDFLAGS']) env['CCFLAGS'] = Split('-pipe -Wall -std=c99 -Wno-switch -Wno-unused -Wno-missing-braces -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DTEXT_DOMAIN=\\"zfs-fuse\\" ') if osname == "Linux": @@ -40,25 +46,12 @@ if osname == "Linux": debug = int(ARGUMENTS.get('debug', '0')) optim = ARGUMENTS.get('optim', '-O2') -if not debug: - env.Append(LINKFLAGS = ['-s']) - env.Append(CCFLAGS = Split(" ".join(["-s -DNDEBUG", optim]))); -else: - env.Append(LINKFLAGS = ['-ggdb']) - env.Append(CCFLAGS = ['-ggdb']) -# Be careful here, one of DEBUG or NDEBUG must be defined, if you undef both, you'll get unexpected results - if debug == 1: - env.Append(CCFLAGS = Split(" ".join(["-DNDEBUG", optim]))); - elif debug == 2: - env.Append(CCFLAGS = ['-DDEBUG']) - elif debug == 3: - env.Append(CCFLAGS = Split('-finstrument-functions -DDEBUG')) +env.Append(CCFLAGS = ['-DNDEBUG']) -if not (('-DDEBUG' in env['CCFLAGS']) or - ('-DNDEBUG' in env['CCFLAGS'])): - print - print "Misconfigured debug level: Neither DEBUG or NDEBUG appears to have been defined: %s" % env['CCFLAGS'] - sys.exit(1) +if 'CPPFLAGS' in os.environ: + env.Append(CPPFLAGS = " "+os.environ['CPPFLAGS']) +if 'CCFLAGS' in os.environ: + env.Append(CPPFLAGS = " "+os.environ['CCFLAGS']) env['CPPPATH'] = [] @@ -120,7 +113,7 @@ env.Install(install_dir, 'cmd/zpool/zpoo env.Install(install_dir, 'cmd/zfs/zfs') env.Install(install_dir, 'zfs-fuse/zfs-fuse') env.Install(install_dir, 'cmd/zstreamdump/zstreamdump') -env.Install(cfg_dir, '../contrib/zfs_pool_alert') +env.Install(libexec_dir, '../contrib/zfs_pool_alert') env.Install(man_dir, '../doc/zdb.8') env.Install(man_dir, '../doc/zfs.8') @@ -132,4 +125,4 @@ if "tags" in sys.argv: print "updating tags..." os.system("ctags --extra=+f `find -name '*.c'` `find -name '*.h'`") -env.Alias('install', [install_dir, man_dir, cfg_dir]) +env.Alias('install', [install_dir, man_dir, cfg_dir, libexec_dir])
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor