diff options
| -rw-r--r-- | rules/alsa-lib.make | 8 | ||||
| -rw-r--r-- | rules/glib.make | 13 |
2 files changed, 7 insertions, 14 deletions
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make index af49fc0b8..ece6a97fd 100644 --- a/rules/alsa-lib.make +++ b/rules/alsa-lib.make @@ -60,11 +60,11 @@ alsa-lib_prepare: $(STATEDIR)/alsa-lib.prepare ALSA_LIB_PATH := PATH=$(CROSS_PATH) ALSA_LIB_ENV := $(CROSS_ENV) + # # autoconf # ALSA_LIB_AUTOCONF := $(CROSS_AUTOCONF_USR) -ALSA_LIB_AUTOCONF += --libdir=$(SYSROOT)/usr/lib $(STATEDIR)/alsa-lib.prepare: $(alsa-lib_prepare_deps_default) @$(call targetinfo, $@) @@ -82,7 +82,7 @@ alsa-lib_compile: $(STATEDIR)/alsa-lib.compile $(STATEDIR)/alsa-lib.compile: $(alsa-lib_compile_deps_default) @$(call targetinfo, $@) - cd $(ALSA_LIB_DIR) && $(ALSA_LIB_PATH) make + cd $(ALSA_LIB_DIR) && $(ALSA_LIB_PATH) $(MAKE) $(PARALLELMFLAGS) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -137,11 +137,11 @@ $(STATEDIR)/alsa-lib.targetinstall: $(alsa-lib_targetinstall_deps_default) @$(call install_copy, alsa-lib, \ 0, 0, 0755, $(ALSA_LIB_DIR)/modules/mixer/simple/.libs/smixer-hda.so, \ /lib/alsa-lib/smixer/smixer-hda.so ) - + @$(call install_copy, alsa-lib, \ 0, 0, 0644, $(ALSA_LIB_DIR)/src/conf/alsa.conf, \ /usr/share/alsa/alsa.conf, n) - + @$(call install_copy, alsa-lib, \ 0, 0, 0644, $(ALSA_LIB_DIR)/src/conf/pcm/default.conf, \ /usr/share/alsa/pcm/default.conf, n) diff --git a/rules/glib.make b/rules/glib.make index 0ffe8ac53..9acfb6732 100644 --- a/rules/glib.make +++ b/rules/glib.make @@ -62,20 +62,13 @@ glib_prepare: $(STATEDIR)/glib.prepare GLIB_PATH := PATH=$(CROSS_PATH) GLIB_ENV := \ $(CROSS_ENV) \ - glib_cv_stack_grows=no - -#FIXME -#ifdef $(PTXCONF_GLIBC_DL) -#GLIB_ENV += glib_cv_uscore=yes -#else -GLIB_ENV += glib_cv_uscore=no -#endif + glib_cv_stack_grows=no \ + glib_cv_uscore=no # # autoconf # GLIB_AUTOCONF := $(CROSS_AUTOCONF_USR) -GLIB_AUTOCONF += --libdir=$(SYSROOT)/usr/lib $(STATEDIR)/glib.prepare: $(glib_prepare_deps_default) @$(call targetinfo, $@) @@ -93,7 +86,7 @@ glib_compile: $(STATEDIR)/glib.compile $(STATEDIR)/glib.compile: $(glib_compile_deps_default) @$(call targetinfo, $@) - cd $(GLIB_DIR) && $(GLIB_PATH) make + cd $(GLIB_DIR) && $(GLIB_PATH) $(MAKE) $(PARALLELMFLAGS) @$(call touch, $@) # ---------------------------------------------------------------------------- |