From 68f9d5a5df81b4ba801b644474156d816b711147 Mon Sep 17 00:00:00 2001 From: triaxx Date: Sat, 10 Oct 2020 14:17:02 +0000 Subject: libusb1: Fix PR pkg/54903 pkgsrc changes: --------------- * Remove the pkgconfig file generation since the version of libusb1 cannot be obtained by parsing LIBUSB_API_VERSION from libusb.h (e.g. FreeBSD provides 0x01000102 for 1.0.13 and Arch provides 0x01000107 for 1.0.23). * At least FreeBSD, Debian and Arch provides a libusb-1.0.pc file for their native implementation. Link this file to ${BUILDLINK_DIR}. * Add logic in mk/buildlink3 to find pkgconfig files in common pkgconfig directories (for at least FreeBSD, Debian and Arch). --- mk/buildlink3/bsd.builtin.mk | 3 +- mk/buildlink3/find-pkgconfig-files.mk | 83 +++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 mk/buildlink3/find-pkgconfig-files.mk (limited to 'mk/buildlink3') diff --git a/mk/buildlink3/bsd.builtin.mk b/mk/buildlink3/bsd.builtin.mk index 3d7687650f3..215e0ba5dd7 100644 --- a/mk/buildlink3/bsd.builtin.mk +++ b/mk/buildlink3/bsd.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.builtin.mk,v 1.14 2018/08/22 20:48:36 maya Exp $ +# $NetBSD: bsd.builtin.mk,v 1.15 2020/10/10 14:17:03 triaxx Exp $ # # Copyright (c) 2004-2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -166,3 +166,4 @@ _BUILTIN_PKGS+= ${_pkg_} .include "../../mk/buildlink3/find-libs.mk" .include "../../mk/buildlink3/find-headers.mk" .include "../../mk/buildlink3/find-files.mk" +.include "../../mk/buildlink3/find-pkgconfig-files.mk" diff --git a/mk/buildlink3/find-pkgconfig-files.mk b/mk/buildlink3/find-pkgconfig-files.mk new file mode 100644 index 00000000000..c84466a27df --- /dev/null +++ b/mk/buildlink3/find-pkgconfig-files.mk @@ -0,0 +1,83 @@ +# $NetBSD: find-pkgconfig-files.mk,v 1.1 2020/10/10 14:17:03 triaxx Exp $ +# +# Copyright (c) 2020 The NetBSD Foundation, Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# + +# +# This is a "subroutine" that can be included to detect the presence of +# pkg-config files in the base system. +# +# The following variables must be defined before including this file: +# +# BUILTIN_FIND_PKGCONFIG_VAR is a list of variables to define. These +# variables take the value of the path to the file that is +# "found". +# +# BUILTIN_FIND_PKGCONFIG. is the list of header files to find, in +# order, on the ${BUILTIN_PKGCONFIG_DIRS}. The variable is set +# to the first path "found" on the filesystem. +# +# After including this file, the following variables are defined: +# +# is the first of the header file listed in +# ${BUILTIN_FIND_PKGCONFIG.} that is "found" in +# ${BUILTIN_PKGCONFIG_DIRS}, or else it is "__nonexistent__". +# +# An example use is: +# +# BUILTIN_FIND_PKGCONFIG_FILES_VAR:= LIB1 LIB2 +# +# BUILTIN_FIND_PKGCONFIG_FILES.LIB1= lib1.pc lib-1.0.pc + +# BUILTIN_FIND_PKGCONFIG_FILES.LIB2= lib2.pc lib-2.0.pc +# .include "../../mk/buildlink3/find-pkgconfig-files.mk" +# + +BUILTIN_PKGCONFIG_DIRS?= /usr/lib/pkgconfig \ + /usr/share/pkgconfig \ + /usr/libdata/pkgconfig \ + /usr/lib/x86_64-linux-gnu/pkgconfig \ + /usr/lib/aarch64-linux-gnu/pkgconfig \ + /usr/lib/arm-linux-gnueabi/pkgconfig \ + /usr/lib/arm-linux-gnueabihf/pkgconfig \ + /usr/lib/i386-linux-gnu/pkgconfig \ + /usr/lib/mips64el-linux-gnuabi64/pkgconfig \ + /usr/lib/mipsel-linux-gnu/pkgconfig \ + /usr/lib/powerpc64le-linux-gnu/pkgconfig \ + /usr/lib/s390x-linux-gnu/pkgconfig + +.for _var_ in ${BUILTIN_FIND_PKGCONFIG_FILES_VAR} +. if !defined(${_var_}) +${_var_}= __nonexistent__ +. for _file_ in ${BUILTIN_FIND_PKGCONFIG_FILES.${_var_}} +. for _dir_ in ${BUILTIN_PKGCONFIG_DIRS} +. if !empty(${_var_}:M__nonexistent__) && exists(${_dir_}/${_file_}) +${_var_}= ${_dir_}/${_file_} +. endif +. endfor +. endfor +. endif +MAKEVARS+= ${_var_} +.endfor -- cgit v1.2.3