mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 00:30:06 +02:00
80 lines
2.3 KiB
Plaintext
80 lines
2.3 KiB
Plaintext
From 94f1698e2348f513128bf3e7dc789df498b93c9d Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Mon, 19 May 2014 19:39:09 +0000
|
|
Subject: Haiku has no libm
|
|
|
|
|
|
diff --git a/examples/wscript_build b/examples/wscript_build
|
|
index 4a1ad39..7ed5b8d 100644
|
|
--- a/examples/wscript_build
|
|
+++ b/examples/wscript_build
|
|
@@ -24,7 +24,7 @@ bld(features = 'c',
|
|
for source_file in programs_source:
|
|
bld(features = 'c cprogram',
|
|
includes = '../src',
|
|
- lib = 'm',
|
|
+ lib = '',
|
|
use = ['aubio', 'utilsio'],
|
|
uselib = uselib,
|
|
source = source_file,
|
|
diff --git a/src/wscript_build b/src/wscript_build
|
|
index ba64b25..8fd514c 100644
|
|
--- a/src/wscript_build
|
|
+++ b/src/wscript_build
|
|
@@ -15,7 +15,7 @@ ctx(features = 'c',
|
|
source = source,
|
|
includes = ['.'],
|
|
uselib = uselib,
|
|
- lib = 'm',
|
|
+ lib = '',
|
|
target = 'lib_objects')
|
|
|
|
# build libaubio.so (cshlib) and/or libaubio.a (cstlib)
|
|
@@ -30,7 +30,7 @@ for target in build_features:
|
|
ctx(features = 'c ' + target,
|
|
use = ['lib_objects'],
|
|
uselib = uselib,
|
|
- lib = 'm',
|
|
+ lib = '',
|
|
target = 'aubio',
|
|
vnum = ctx.env['LIB_VERSION'])
|
|
|
|
diff --git a/tests/wscript_build b/tests/wscript_build
|
|
index 6aebad6..67b6300 100644
|
|
--- a/tests/wscript_build
|
|
+++ b/tests/wscript_build
|
|
@@ -14,7 +14,7 @@ for target_name in ctx.path.ant_glob('src/**/*.c'):
|
|
extra_source = []
|
|
|
|
bld(features = 'c cprogram test',
|
|
- lib = 'm',
|
|
+ lib = '',
|
|
uselib = uselib,
|
|
source = [target_name] + extra_source,
|
|
target = str(target_name).split('.')[0],
|
|
--
|
|
2.2.2
|
|
|
|
|
|
From 60153b9125cc45f6ba429a8955d74c7fad577deb Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Mon, 19 May 2014 23:15:04 +0000
|
|
Subject: fix headers installation
|
|
|
|
|
|
diff --git a/src/wscript_build b/src/wscript_build
|
|
index 8fd514c..4b19c0d 100644
|
|
--- a/src/wscript_build
|
|
+++ b/src/wscript_build
|
|
@@ -35,6 +35,6 @@ for target in build_features:
|
|
vnum = ctx.env['LIB_VERSION'])
|
|
|
|
# install headers, except _priv.h ones
|
|
-ctx.install_files('${PREFIX}/include/aubio/',
|
|
+ctx.install_files('${INCLUDEDIR}/aubio/',
|
|
ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']),
|
|
relative_trick=True)
|
|
--
|
|
2.2.2
|
|
|