diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2008-06-12 08:03:38 +0000 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2008-06-12 08:03:38 +0000 |
| commit | 12aafc5e63fb43b2dc666f2315b1853e248f37fc (patch) | |
| tree | 405fb19f3ff7c72bfa16de1921e6f745da0ccce1 /rules/libx86.make | |
| parent | 20ab6ffb02287fd7ab66105c8ed2317437ce1e92 (diff) | |
| download | ptxdist-12aafc5e63fb43b2dc666f2315b1853e248f37fc.tar.gz ptxdist-12aafc5e63fb43b2dc666f2315b1853e248f37fc.tar.xz | |
* Use the "right" way to enable these packages on certain platforms only
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8499 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/libx86.make')
| -rw-r--r-- | rules/libx86.make | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/rules/libx86.make b/rules/libx86.make index ab51d3f71..28e7285f1 100644 --- a/rules/libx86.make +++ b/rules/libx86.make @@ -12,7 +12,8 @@ # # We provide this package # -PACKAGES-$(PTXCONF_LIBX86) += libx86 +PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_LIBX86) += libx86 +PACKAGES-$(PTXCONF_ARCH_PPC)-$(PTXCONF_LIBX86) += libx86 # # Paths and names @@ -54,16 +55,9 @@ $(STATEDIR)/libx86.extract: LIBX86_PATH := PATH=$(CROSS_PATH) LIBX86_ENV := $(CROSS_ENV) -# enable build un supported platforms only -ifdef ARCH_X86 -LIBX86_BUILD = 1 -else +ifndef ARCH_X86 # use emulator on non x86 architectures LIBX86_ENV += BACKEND=x86emu - -ifdef ARCH_PPC -LIBX86_BUILD = 1 -endif endif # @@ -85,9 +79,7 @@ $(STATEDIR)/libx86.prepare: $(STATEDIR)/libx86.compile: @$(call targetinfo, $@) -ifdef LIBX86_BUILD cd $(LIBX86_DIR) && $(LIBX86_ENV) $(LIBX86_PATH) $(MAKE) $(PARALLELMFLAGS) -endif @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -96,9 +88,7 @@ endif $(STATEDIR)/libx86.install: @$(call targetinfo, $@) -ifdef LIBX86_BUILD @$(call install, LIBX86) -endif @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -108,7 +98,6 @@ endif $(STATEDIR)/libx86.targetinstall: @$(call targetinfo, $@) -ifdef LIBX86_BUILD @$(call install_init, libx86) @$(call install_fixup, libx86,PACKAGE,libx86) @$(call install_fixup, libx86,PRIORITY,optional) @@ -122,7 +111,6 @@ ifdef LIBX86_BUILD @$(call install_link, libx86, libx86.so.1, /usr/lib/libx86.so) @$(call install_finish, libx86) -endif @$(call touch, $@) |