From patchwork Mon Nov 17 08:18:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 411422 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 213DA14012F for ; Mon, 17 Nov 2014 19:19:02 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E521D954A8; Mon, 17 Nov 2014 08:18:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z-V1na18UsY4; Mon, 17 Nov 2014 08:18:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E5CB095499; Mon, 17 Nov 2014 08:18:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 03ED51C2282 for ; Mon, 17 Nov 2014 08:18:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F40EA91B0A for ; Mon, 17 Nov 2014 08:18:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oZIXAS3VhTOJ for ; Mon, 17 Nov 2014 08:18:50 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id 723CE91942 for ; Mon, 17 Nov 2014 08:18:49 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id DEC6C4407A0; Mon, 17 Nov 2014 10:18:44 +0200 (IST) From: Baruch Siach To: buildroot@busybox.net Date: Mon, 17 Nov 2014 10:18:14 +0200 Message-Id: <83acc63ec240a462958adbc5bdcfea13758768d5.1416212296.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.1.3 Subject: [Buildroot] [PATCH 1/3] live555: use upstream install target for staging installation X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Move include directories out of $(STAGING_DIR)/usr/include/live. This is upstream choice, and is consistent with e.g. Debian. Update mplayer and vlc to match. Signed-off-by: Baruch Siach --- package/live555/live555.mk | 21 ++------------------- package/mplayer/mplayer.mk | 2 +- package/vlc/vlc.mk | 9 ++++----- 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/package/live555/live555.mk b/package/live555/live555.mk index e933faaeae01..8c31a086559b 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -23,6 +23,7 @@ define LIVE555_CONFIGURE_CMDS echo 'CPLUSPLUS_COMPILER = $(TARGET_CXX)' >> $(@D)/config.linux echo 'LINK = $(TARGET_CXX) -o' >> $(@D)/config.linux echo 'LINK_OPTS = -L. $(TARGET_LDFLAGS)' >> $(@D)/config.linux + echo 'PREFIX = /usr' >> $(@D)/config.linux (cd $(@D); ./genMakefiles linux) endef @@ -30,31 +31,13 @@ define LIVE555_BUILD_CMDS $(MAKE) -C $(@D) all endef -LIVE555_HEADERS_TO_INSTALL = \ - liveMedia/include \ - groupsock/include \ - UsageEnvironment/include \ - BasicUsageEnvironment/include - -LIVE555_LIBS_TO_INSTALL = \ - liveMedia/libliveMedia.a \ - groupsock/libgroupsock.a \ - UsageEnvironment/libUsageEnvironment.a \ - BasicUsageEnvironment/libBasicUsageEnvironment.a - LIVE555_FILES_TO_INSTALL-y = LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_OPENRTSP) += testProgs/openRTSP LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MEDIASERVER) += mediaServer/live555MediaServer LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MPEG2_INDEXER) += testProgs/MPEG2TransportStreamIndexer define LIVE555_INSTALL_STAGING_CMDS - for i in $(LIVE555_HEADERS_TO_INSTALL); do \ - mkdir -p $(STAGING_DIR)/usr/include/live/`dirname $$i`; \ - cp -a $(@D)/$$i/* $(STAGING_DIR)/usr/include/live/`dirname $$i`; \ - done; \ - for i in $(LIVE555_LIBS_TO_INSTALL); do \ - $(INSTALL) -D -m 0755 $(@D)/$$i $(STAGING_DIR)/usr/lib/`basename $$i`; \ - done + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) install endef define LIVE555_INSTALL_TARGET_CMDS diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk index dbde97767b35..b2530e4a1300 100644 --- a/package/mplayer/mplayer.mk +++ b/package/mplayer/mplayer.mk @@ -92,7 +92,7 @@ MPLAYER_DEPENDENCIES += live555 MPLAYER_CONF_OPTS += --enable-live MPLAYER_LIVE555 = liveMedia groupsock UsageEnvironment BasicUsageEnvironment MPLAYER_CFLAGS += \ - $(addprefix -I$(STAGING_DIR)/usr/include/live/,$(MPLAYER_LIVE555)) + $(addprefix -I$(STAGING_DIR)/usr/include/,$(MPLAYER_LIVE555)) MPLAYER_LDFLAGS += $(addprefix -l,$(MPLAYER_LIVE555)) -lstdc++ else MPLAYER_CONF_OPTS += --disable-live diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 7e81d590e507..e2c81d6e8959 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -231,11 +231,10 @@ VLC_CONF_OPTS += --enable-live555 VLC_DEPENDENCIES += live555 VLC_CONF_ENV += \ LIVE555_CFLAGS="\ - -I$(STAGING_DIR)/usr/include/live \ - -I$(STAGING_DIR)/usr/include/live/BasicUsageEnvironment \ - -I$(STAGING_DIR)/usr/include/live/groupsock \ - -I$(STAGING_DIR)/usr/include/live/liveMedia \ - -I$(STAGING_DIR)/usr/include/live/UsageEnvironment \ + -I$(STAGING_DIR)/usr/include/BasicUsageEnvironment \ + -I$(STAGING_DIR)/usr/include/groupsock \ + -I$(STAGING_DIR)/usr/include/liveMedia \ + -I$(STAGING_DIR)/usr/include/UsageEnvironment \ " \ LIVE555_LIBS="-L$(STAGING_DIR)/usr/lib -lliveMedia" else