Commit 785d6cc6 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

package: remove redundant pkg-config variables 

Also remove some redundant or predefined configure/make args in these
packages.

Patch by Markus Heidelberg.
parent 4cb7b78a

package/dbus-glib/dbus-glib.mk

+0 −2
Original line number Diff line number Diff line
@@ -32,13 +32,11 @@ $(DBUS_GLIB_DIR)/.configured: $(DBUS_GLIB_DIR)/.unpacked 
		DBUS_LIBS="$(STAGING_DIR)/usr/lib/libdbus-1.so" \

		DBUS_GLIB_CFLAGS="-I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \

		DBUS_GLIB_LIBS="$(STAGING_DIR)/lib/libglib-2.0.so $(STAGING_DIR)/lib/libgobject-2.0.so $(STAGING_DIR)/lib/libgmodule-2.0.so $(STAGING_DIR)/lib/libgthread-2.0.so" \

		PKG_CONFIG=/usr/bin/pkg-config \

		./configure \

		--target=$(GNU_TARGET_NAME) \

		--host=$(GNU_TARGET_NAME) \

		--build=$(GNU_HOST_NAME) \

		--prefix=/usr \

		--exec-prefix=/usr \

		--localstatedir=/var \

		--program-prefix="" \

		--disable-tests \

package/gqview/gqview.mk

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ GQVIEW_AUTORECONF = NO 
GQVIEW_INSTALL_STAGING = NO

GQVIEW_INSTALL_TARGET = YES



GQVIEW_CONF_OPT = PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig



GQVIEW_DEPENDENCIES = uclibc pkgconfig libgtk2



$(eval $(call AUTOTARGETS,package,gqview))

package/hal/hal.mk

+0 −2
Original line number Diff line number Diff line
@@ -40,14 +40,12 @@ $(HAL_DIR)/.configured: $(HAL_DIR)/.unpacked /usr/bin/pkg-config 
		DBUS_LIBS="$(STAGING_DIR)/usr/lib/libdbus-1.so" \

		VOLUME_ID_CFLAGS="$(TARGET_CFLAGS)" \

		VOLUME_ID_LIBS="$(STAGING_DIR)/usr/lib/libvolume_id.so" \

		PKG_CONFIG=/usr/bin/pkg-config \

		ac_cv_path_LIBUSB_CONFIG= \

		./configure \

		--target=$(GNU_TARGET_NAME) \

		--host=$(GNU_TARGET_NAME) \

		--build=$(GNU_HOST_NAME) \

		--prefix=/usr \

		--datadir=/usr/share \

		--sysconfdir=/etc \

		--localstatedir=/var \

		--with-hwdata=$(TARGET_DIR)/usr/share/hwdata \

package/java/classpath/classpath.mk

+4 −9
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ CLASSPATH_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ 
		ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \

		ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \

		ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \

		utils_cv_func_mkdir_trailing_slash_bug=no ac_cv_func_memcmp_working=yes \

		utils_cv_func_mkdir_trailing_slash_bug=no \

		ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes \

		ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes \

		ac_cv_func_realloc_0_nonnull=yes jm_cv_func_gettimeofday_clobber=no \
@@ -45,17 +45,12 @@ CLASSPATH_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ 
		ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no





CLASSPATH_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \

		--build=$(GNU_HOST_NAME) --prefix=/usr \

		--exec-prefix=/usr --bindir=/usr/bin \

		--sbindir=/usr/sbin --libdir=/usr/lib \

		--libexecdir=/usr/lib --sysconfdir=/etc \

		--datadir=/usr/share --localstatedir=/var \

		--includedir=/usr/include --mandir=/usr/man \

CLASSPATH_CONF_OPT = \

		--libexecdir=/usr/lib --localstatedir=/var --mandir=/usr/man \

		--infodir=/usr/info --enable-shared \

		--enable-static \

		--disable-glibtest --enable-explicit-deps=no \

		--disable-debug PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \

		--disable-debug \

		--disable-gconf-peer --disable-examples --disable-plugin



CLASSPATH_DEPENDENCIES = uclibc pkgconfig png jpeg tiff

package/java/jamvm/jamvm.mk

+4 −11
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ JAMVM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/jam 
JAMVM_AUTORECONF = NO

JAMVM_INSTALL_STAGING = YES

JAMVM_INSTALL_TARGET = YES

JAMVM_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install

JAMVM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install



JAMVM_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
@@ -28,7 +27,7 @@ JAMVM_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ 
		ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \

		ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \

		ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \

		utils_cv_func_mkdir_trailing_slash_bug=no ac_cv_func_memcmp_working=yes \

		utils_cv_func_mkdir_trailing_slash_bug=no \

		ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes \

		ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes \

		ac_cv_func_realloc_0_nonnull=yes jm_cv_func_gettimeofday_clobber=no \
@@ -43,18 +42,12 @@ JAMVM_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ 
		ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \

		ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no



JAMVM_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \

		--build=$(GNU_HOST_NAME) --prefix=/usr \

		--exec-prefix=/usr --bindir=/usr/bin \

		--sbindir=/usr/sbin --libdir=/usr/lib \

		--libexecdir=/usr/lib --sysconfdir=/etc \

		--datadir=/usr/share --localstatedir=/var \

		--includedir=/usr/include --mandir=/usr/man \

JAMVM_CONF_OPT = \

		--libexecdir=/usr/lib --localstatedir=/var --mandir=/usr/man \

		--infodir=/usr/info --enable-shared \

		--enable-static \

		--disable-glibtest --enable-explicit-deps=no \

		--disable-debug PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \

		--with-classpath-install-dir=/usr \

		--disable-debug --with-classpath-install-dir=/usr





JAMVM_DEPENDENCIES = uclibc pkgconfig classpath