- fixes and cleanups (Cristian Ionescu-Idbohrn) (7b0ad787) · Commits · Dom Sekotill / buildroot

package/libevent/libevent.mk

+6 −3

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ $(LIBEVENT_DIR)/.configured: $(LIBEVENT_DIR)/.unpacked
		--host=$(GNU_TARGET_NAME) \
		--build=$(GNU_HOST_NAME) \
		--prefix=/usr \
		--mandir=/usr/share/man \
		--disable-static \
		--with-gnu-ld \
		)
		@@ -44,9 +45,11 @@ $(STAGING_DIR)/$(LIBEVENT_TARGET_BINARY): $(LIBEVENT_DIR)/$(LIBEVENT_BINARY)

		$(TARGET_DIR)/$(LIBEVENT_TARGET_BINARY): $(STAGING_DIR)/$(LIBEVENT_TARGET_BINARY)
		$(MAKE) -C $(LIBEVENT_DIR) DESTDIR=$(TARGET_DIR) install
		rm -f $(TARGET_DIR)/usr/lib/libevent.la $(TARGET_DIR)/usr/include/ev
		rm -f $(TARGET_DIR)/usr/man/man3/ev*.3
		rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/man/man3
		rm -f $(addprefix $(TARGET_DIR)/usr/,lib/libevent*.la \
		include/ev*)
		ifneq ($(BR2_HAVE_MANPAGES),y)
		rm -fr $(TARGET_DIR)/usr/share/man
		endif

		libevent: uclibc $(TARGET_DIR)/$(LIBEVENT_TARGET_BINARY)

package/libgcrypt/libgcrypt.mk

+5 −2

Original line number	Diff line number	Diff line
		@@ -42,8 +42,8 @@ $(LIBGCRYPT_DIR)/.configured: $(LIBGCRYPT_DIR)/.source
		--datadir=/usr/share \
		--localstatedir=/var \
		--includedir=/usr/include \
		--mandir=/usr/man \
		--infodir=/usr/info \
		--mandir=/usr/share/man \
		--infodir=/usr/share/info \
		--disable-optimization \
		)
		touch $@
		@@ -57,6 +57,9 @@ $(STAGING_DIR)/$(LIBGCRYPT_TARGET_LIBRARY): $(LIBGCRYPT_DIR)/$(LIBGCRYPT_LIBRARY

		$(TARGET_DIR)/$(LIBGCRYPT_TARGET_LIBRARY): $(STAGING_DIR)/$(LIBGCRYPT_TARGET_LIBRARY)
		cp -dpf $<* $(TARGET_DIR)/$(LIBGCRYPT_DESTDIR)
		ifneq ($(BR2_HAVE_INFOPAGES),y)
		rm -rf $(STAGING_DIR)/usr/share/info
		endif

		libgcrypt: uclibc libgpg-error $(TARGET_DIR)/$(LIBGCRYPT_TARGET_LIBRARY)

package/liblockfile/liblockfile.mk

+19 −10

Original line number	Diff line number	Diff line
		@@ -28,29 +28,38 @@ $(LIBLOCKFILE_DIR)/.configured: $(LIBLOCKFILE_DIR)/.unpacked
		--target=$(GNU_TARGET_NAME) \
		--host=$(GNU_TARGET_NAME) \
		--build=$(GNU_HOST_NAME) \
		--prefix=/usr \
		--bindir=/usr/bin \
		--libdir=/usr/lib \
		--includedir=/usr/include \
		--mandir=/usr/share/man \
		--enable-shared \
		)
		touch $@

		$(STAGING_DIR)/lib/$(LIBLOCKFILE_BINARY): $(LIBLOCKFILE_DIR)/.configured
		mkdir -p $(STAGING_DIR)/man/man1 $(STAGING_DIR)/man/man3
		$(MAKE) -C $(LIBLOCKFILE_DIR) prefix= ROOT=$(STAGING_DIR) install
		ln -sf $(LIBLOCKFILE_BINARY) $(STAGING_DIR)/lib/liblockfile.so.1
		cp -dpf $(LIBLOCKFILE_DIR)/liblockfile.a $(STAGING_DIR)/lib
		mkdir -p $(addprefix $(STAGING_DIR)/usr/share/man/man,1 3)
		mkdir -p $(STAGING_DIR)/usr/share/man/man3
		rm -f $(STAGING_DIR)/usr/lib/liblockfile.so
		$(MAKE) -C $(LIBLOCKFILE_DIR) ROOT=$(STAGING_DIR) install
		ln -sf $(LIBLOCKFILE_BINARY) $(STAGING_DIR)/usr/lib/liblockfile.so.1
		cp -dpf $(LIBLOCKFILE_DIR)/liblockfile.a $(STAGING_DIR)/usr/lib

		$(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY): $(STAGING_DIR)/lib/$(LIBLOCKFILE_BINARY)
		mkdir -p $(TARGET_DIR)/usr/lib
		cp -a $(STAGING_DIR)/lib/liblockfile.so* $(TARGET_DIR)/usr/lib
		$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY)
		cp -a $(STAGING_DIR)/usr/lib/liblockfile.so* $(TARGET_DIR)/usr/lib
		$(STRIP) $(STRIP_STRIP_UNNEEDED) \
		$(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY)

		liblockfile: uclibc $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY)

		liblockfile-clean:
		rm -f $(TARGET_DIR)/usr/lib/liblockfile.so*
		rm -f $(STAGING_DIR)/lib/liblockfile*
		rm -f $(STAGING_DIR)/usr/include/lockfile.h
		rm -f $(STAGING_DIR)/usr/include/mailfile.h
		rm -rf $(STAGING_DIR)/man
		rm -f $(STAGING_DIR)/usr/lib/liblockfile*
		rm -f $(addprefix $(STAGING_DIR)/usr/include/,lockfile.h mailfile.h)
		ifneq ($(BR2_HAVE_MANPAGES),y)
		rm -rf $(STAGING_DIR)/usr/share/man
		endif
		$(MAKE) -C $(LIBLOCKFILE_DIR) clean

		liblockfile-dirclean:

package/libsndfile/libsndfile.mk

+6 −4

Original line number	Diff line number	Diff line
		@@ -36,17 +36,20 @@ $(LIBSNDFILE_DIR)/$(LIBSNDFILE_BINARY): $(LIBSNDFILE_DIR)/.configured
		$(MAKE) CC=$(TARGET_CC) -C $(LIBSNDFILE_DIR)

		$(TARGET_DIR)/$(LIBSNDFILE_TARGET_BINARY): $(LIBSNDFILE_DIR)/$(LIBSNDFILE_BINARY)
		$(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBSNDFILE_DIR) install
		$(MAKE) prefix=$(STAGING_DIR)/usr -C $(LIBSNDFILE_DIR) install
		rm -Rf $(TARGET_DIR)/usr/man
		$(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBSNDFILE_DIR) install
		ifneq ($(BR2_HAVE_MANPAGES),y)
		rm -Rf $(TARGET_DIR)/usr/share/man
		rm -Rf $(STAGING_DIR)/usr/share/man
		endif

		libsndfile: uclibc $(TARGET_DIR)/$(LIBSNDFILE_TARGET_BINARY)

		libsndfile-source: $(DL_DIR)/$(LIBSNDFILE_SOURCE)

		libsndfile-clean:
		$(MAKE) prefix=$(STAGING_DIR)/usr -C $(LIBSNDFILE_DIR) uninstall
		$(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBSNDFILE_DIR) uninstall
		-$(MAKE) prefix=$(STAGING_DIR)/usr -C $(LIBSNDFILE_DIR) uninstall
		-$(MAKE) -C $(LIBSNDFILE_DIR) clean

		libsndfile-dirclean:
		@@ -60,4 +63,3 @@ libsndfile-dirclean:
		ifeq ($(strip $(BR2_PACKAGE_LIBSNDFILE)),y)
		TARGETS+=libsndfile
		endif

package/libtool/libtool.mk

+20 −8

Original line number	Diff line number	Diff line
		@@ -46,8 +46,8 @@ $(LIBTOOL_DIR)/.configured: $(LIBTOOL_SRC_DIR)/.unpacked
		--sysconfdir=/etc \
		--datadir=/usr/share \
		--localstatedir=/var \
		--mandir=/usr/man \
		--infodir=/usr/info \
		--mandir=/usr/share/man \
		--infodir=/usr/share/info \
		$(DISABLE_NLS) \
		)
		touch $@
		@@ -67,15 +67,21 @@ $(TARGET_DIR)/$(LIBTOOL_TARGET_BINARY): $(LIBTOOL_DIR)/$(LIBTOOL_BINARY)
		sysconfdir=$(TARGET_DIR)/etc \
		localstatedir=$(TARGET_DIR)/var \
		libdir=$(TARGET_DIR)/usr/lib \
		infodir=$(TARGET_DIR)/usr/info \
		mandir=$(TARGET_DIR)/usr/man \
		infodir=$(TARGET_DIR)/usr/share/info \
		mandir=$(TARGET_DIR)/usr/share/man \
		includedir=$(TARGET_DIR)/usr/include \
		-C $(LIBTOOL_DIR) install
		$(STRIP) $(TARGET_DIR)//usr/lib/libltdl.so...* > /dev/null 2>&1
		$(SED) "s,^CC.*,CC=\"/usr/bin/gcc\"," $(TARGET_DIR)/usr/bin/libtool
		$(SED) "s,^LD.*,LD=\"/usr/bin/ld\"," $(TARGET_DIR)/usr/bin/libtool
		rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
		rm -rf $(TARGET_DIR)/share/locale
		rm -rf $(TARGET_DIR)/usr/share/doc
		ifneq ($(BR2_HAVE_INFOPAGES),y)
		rm -rf $(TARGET_DIR)/usr/share/info
		endif
		ifneq ($(BR2_HAVE_MANPAGES),y)
		rm -rf $(TARGET_DIR)/usr/share/man
		endif
		touch -c $@

		libtool: uclibc $(TARGET_DIR)/$(LIBTOOL_TARGET_BINARY)
		@@ -116,8 +122,14 @@ $(LIBTOOL_HOST_DIR)/$(LIBTOOL_BINARY): $(LIBTOOL_HOST_DIR)/.configured

		$(STAGING_DIR)/$(LIBTOOL_TARGET_BINARY): $(LIBTOOL_HOST_DIR)/$(LIBTOOL_BINARY)
		$(MAKE) -C $(LIBTOOL_HOST_DIR) install
		rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \
		$(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc
		rm -rf $(STAGING_DIR)/share/locale
		rm -rf $(STAGING_DIR)/usr/share/doc
		ifneq ($(BR2_HAVE_INFOPAGES),y)
		rm -rf $(STAGING_DIR)/usr/share/info
		endif
		ifneq ($(BR2_HAVE_MANPAGES),y)
		rm -rf $(STAGING_DIR)/usr/share/man
		endif
		touch -c $@

		host-libtool: $(STAGING_DIR)/$(LIBTOOL_TARGET_BINARY)