Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,58 @@
|
||||
From abc7a780f2a52a1aa3ee288e17140b817b545cc3 Mon Sep 17 00:00:00 2001
|
||||
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
Date: Mon, 2 Nov 2015 18:38:00 -0300
|
||||
Subject: [PATCH] Fix all-variables sysroot prefix problem
|
||||
|
||||
According to the pkg-config specifications (or rather documentation)
|
||||
only the -L/-I directory entries should be sysroot-prefixed.
|
||||
|
||||
We also need to prefix the mapdir/sdkdir variables since they're used by
|
||||
xorg and expected that way.
|
||||
|
||||
Also allow prefixing for includedir and libdir since in some silly cases
|
||||
the directories may be requested barebones via pkg-config
|
||||
--variable=includedir libfool for example.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
---
|
||||
main.c | 17 ++++++++++++-----
|
||||
1 file changed, 12 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/main.c b/main.c
|
||||
index 6947126..52d16c2 100644
|
||||
--- a/main.c
|
||||
+++ b/main.c
|
||||
@@ -313,9 +313,12 @@ print_variable(pkg_t *pkg, void *data, unsigned int flags)
|
||||
memset(req->buf, 0, sizeof(req->buf));
|
||||
|
||||
if (*var == '/' && (flags & PKGF_MUNGE_SYSROOT_PREFIX) &&
|
||||
- (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir))))
|
||||
- strlcat(req->buf, sysroot_dir, sizeof(req->buf));
|
||||
-
|
||||
+ (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir))) &&
|
||||
+ (!strcmp(req->variable, "includedir") || \
|
||||
+ !strcmp(req->variable, "libdir") || \
|
||||
+ !strcmp(req->variable, "mapdir") || \
|
||||
+ !strcmp(req->variable, "sdkdir")))
|
||||
+ strlcat(req->buf, sysroot_dir, sizeof(req->buf));
|
||||
strlcat(req->buf, var, sizeof(req->buf));
|
||||
return;
|
||||
}
|
||||
@@ -323,8 +326,12 @@ print_variable(pkg_t *pkg, void *data, unsigned int flags)
|
||||
strlcat(req->buf, " ", sizeof(req->buf));
|
||||
|
||||
if (*var == '/' && (flags & PKGF_MUNGE_SYSROOT_PREFIX) &&
|
||||
- (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir))))
|
||||
- strlcat(req->buf, sysroot_dir, sizeof(req->buf));
|
||||
+ (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir))) &&
|
||||
+ (!strcmp(req->variable, "includedir") || \
|
||||
+ !strcmp(req->variable, "libdir") || \
|
||||
+ !strcmp(req->variable, "mapdir") || \
|
||||
+ !strcmp(req->variable, "sdkdir")))
|
||||
+ strlcat(req->buf, sysroot_dir, sizeof(req->buf));
|
||||
|
||||
strlcat(req->buf, var, sizeof(req->buf));
|
||||
}
|
||||
--
|
||||
2.4.10
|
||||
|
||||
9
deprecated/firmware/buildroot/package/pkgconf/Config.in
Normal file
9
deprecated/firmware/buildroot/package/pkgconf/Config.in
Normal file
@@ -0,0 +1,9 @@
|
||||
config BR2_PACKAGE_PKGCONF
|
||||
bool "pkgconf"
|
||||
help
|
||||
pkgconf is a program which helps to configure compiler and linker
|
||||
flags for development frameworks. It is similar to pkg-config,
|
||||
but was written from scratch in the summer of 2011 to replace
|
||||
pkg-config, which now needs itself to build itself
|
||||
|
||||
https://github.com/nenolod/pkgconf
|
||||
@@ -0,0 +1,2 @@
|
||||
#!/bin/sh
|
||||
PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-@PKG_CONFIG_LIBDIR@} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-@STAGING_DIR@} $(dirname $0)/pkgconf @STATIC@ $@
|
||||
@@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f pkgconf-0.9.12.tar.bz2
|
||||
45
deprecated/firmware/buildroot/package/pkgconf/pkgconf.mk
Normal file
45
deprecated/firmware/buildroot/package/pkgconf/pkgconf.mk
Normal file
@@ -0,0 +1,45 @@
|
||||
################################################################################
|
||||
#
|
||||
# pkgconf
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PKGCONF_VERSION = 0.9.12
|
||||
PKGCONF_SITE = https://github.com/pkgconf/pkgconf/releases/download/pkgconf-$(PKGCONF_VERSION)
|
||||
PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.bz2
|
||||
PKGCONF_LICENSE = pkgconf license
|
||||
PKGCONF_LICENSE_FILES = COPYING
|
||||
|
||||
PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/usr/bin/pkg-config
|
||||
|
||||
define PKGCONF_LINK_PKGCONFIG
|
||||
ln -sf pkgconf $(TARGET_DIR)/usr/bin/pkg-config
|
||||
endef
|
||||
|
||||
define HOST_PKGCONF_INSTALL_WRAPPER
|
||||
$(INSTALL) -m 0755 -D package/pkgconf/pkg-config.in \
|
||||
$(HOST_DIR)/usr/bin/pkg-config
|
||||
$(SED) 's,@PKG_CONFIG_LIBDIR@,$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig,' \
|
||||
-e 's,@STAGING_DIR@,$(STAGING_DIR),' \
|
||||
$(HOST_DIR)/usr/bin/pkg-config
|
||||
endef
|
||||
|
||||
define HOST_PKGCONF_STATIC
|
||||
$(SED) 's,@STATIC@,--static,' $(HOST_DIR)/usr/bin/pkg-config
|
||||
endef
|
||||
|
||||
define HOST_PKGCONF_SHARED
|
||||
$(SED) 's,@STATIC@,,' $(HOST_DIR)/usr/bin/pkg-config
|
||||
endef
|
||||
|
||||
PKGCONF_POST_INSTALL_TARGET_HOOKS += PKGCONF_LINK_PKGCONFIG
|
||||
HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_INSTALL_WRAPPER
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_STATIC
|
||||
else
|
||||
HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_SHARED
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
Reference in New Issue
Block a user