diff options
| author |   Richard Purdie <rpurdie@rpsys.net> | 2006-12-31 22:31:24 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2006-12-31 22:31:24 +0000 |
| commit | 9bd213b23e9095cc0aa94952cc345a110a5cdc40 (patch) | |
| tree | 4f862fbb29bc438fe7f45f679934a4ec0b91a436 /packages/fontconfig | |
| parent | bbd81bb3d973f809636c55c56bdc5b6ec863bfa0 (diff) | |
| download | openembedded-9bd213b23e9095cc0aa94952cc345a110a5cdc40.tar.gz | |
Split STAGING_BINDIR into CROSS and NATIVE versions. This means there is no need to rename -config scripts and multimachine won't break with binconfig.bbclass. ***NOTE: This change will require staging to be rebuilt***
Diffstat (limited to 'packages/fontconfig')
| -rw-r--r-- | packages/fontconfig/fontconfig-native_2.2.95.bb | 2 | ||||
| -rw-r--r-- | packages/fontconfig/fontconfig-native_2.3.91.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/fontconfig/fontconfig-native_2.2.95.bb b/packages/fontconfig/fontconfig-native_2.2.95.bb index 58589ae124..541b74634c 100644 --- a/packages/fontconfig/fontconfig-native_2.2.95.bb +++ b/packages/fontconfig/fontconfig-native_2.2.95.bb @@ -6,7 +6,7 @@ DEPENDS = "freetype-native expat-native zlib-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}" EXTRA_OEMAKE = "" -EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1))]}" +EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}" do_stage () { oe_runmake install diff --git a/packages/fontconfig/fontconfig-native_2.3.91.bb b/packages/fontconfig/fontconfig-native_2.3.91.bb index 58589ae124..541b74634c 100644 --- a/packages/fontconfig/fontconfig-native_2.3.91.bb +++ b/packages/fontconfig/fontconfig-native_2.3.91.bb @@ -6,7 +6,7 @@ DEPENDS = "freetype-native expat-native zlib-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}" EXTRA_OEMAKE = "" -EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1))]}" +EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}" do_stage () { oe_runmake install |