X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=misc%2Fgen-pkgconfig.in;h=fa095471b6e15e6e78bdef2d51b9313cb453253b;hb=67ea6645053c80c6eea47a4ff6d9153da83ac2ac;hp=134893816f8beca3a0dec3d11fc0d03bf3d7fb87;hpb=3e37c7d3fa122563a9d88168926f61286ef30cd3;p=ncurses.git diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in index 13489381..fa095471 100644 --- a/misc/gen-pkgconfig.in +++ b/misc/gen-pkgconfig.in @@ -1,7 +1,7 @@ #!@SHELL@ -# $Id: gen-pkgconfig.in,v 1.46 2020/05/23 17:56:46 tom Exp $ +# $Id: gen-pkgconfig.in,v 1.53 2022/07/16 17:07:38 tom Exp $ ############################################################################## -# Copyright 2018-2019,2020 Thomas E. Dickey # +# Copyright 2018-2021,2022 Thomas E. Dickey # # Copyright 2009-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ]; then fi lib_flags= -for opt in -L$libdir @LDFLAGS@ @EXTRA_PKG_LDFLAGS@ @LIBS@ +for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@ do case $opt in -l*) # LIBS is handled specially below @@ -95,11 +95,47 @@ do -Wl,-z,*) # ignore flags used to manipulate shared image continue ;; + -Wl,--dynamic-linker*) # ignore ELF interpreter + continue + ;; -L*) - [ -d ${opt##-L} ] || continue - case ${opt##-L} in + lib_check=`echo "x$opt" | sed -e 's/^.-L//'` + [ -d "$lib_check" ] || continue + case "$lib_check" in @LD_SEARCHPATH@) # skip standard libdir - continue + if [ "$lib_check" = "$libdir" ] + then + lib_first=yes + IFS_save="$IFS" + IFS='|' + LIBDIRS="@LD_SEARCHPATH@" + for lib_check in $LIBDIRS + do + if [ -d "$lib_check" ] + then + if [ "$lib_check" != "$libdir" ] + then + lib_first=no + fi + break + fi + done + IFS="$IFS_save" + [ $lib_first = yes ] && continue + found=no + for check in $lib_flags + do + if [ "x$check" = "x$opt" ] + then + found=yes + break + fi + done + [ $found = yes ] && continue + : + else + continue + fi ;; *) found=no @@ -183,7 +219,7 @@ do echo "** creating ${name}${suffix}.pc" cat >${name}${suffix}.pc <