[OE-core] [master][zeus][PATCH 2/2] libtirpc: Make it easy to disable the installation of legacy headers

[Peter Kjellerstedt]

Providing symbolic links to the header files to replace the old
corresponding glibc headers seems like a band aid for applications
that have not been updated to cope with the lack of the RPC headers
from glibc. Additionally they clash with glibc if an older version of
glibc is used that still provides the header files. To remedy this,
make it easy to disable the installation of the legacy headers by not
setting the legacy-headers PACKAGECONFIG.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
---
 .../libtirpc/libtirpc_1.1.4.bb                | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb b/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
index 91e0ce6fd2..3c84694161 100644
--- a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
+++ b/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
@@ -17,6 +17,9 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
 SRC_URI[md5sum] = "f5d2a623e9dfbd818d2f3f3a4a878e3a"
 SRC_URI[sha256sum] = "2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d"
 
+PACKAGECONFIG = "legacy-headers"
+PACKAGECONFIG[legacy-headers] = ""
+
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-gssapi"
@@ -24,16 +27,18 @@ EXTRA_OECONF = "--disable-gssapi"
 do_install_append() {
 	chown root:root ${D}${sysconfdir}/netconfig
 
-	for dir in rpc rpcsvc; do
-		install -d ${D}${includedir}/$dir
-		for link_header in ${D}${includedir}/tirpc/$dir/*; do
-			if [ -f $link_header ] &&
-			   [ ! -e ${D}${includedir}/$dir/$(basename $link_header) ]; then
-				ln -sf ../tirpc/$dir/$(basename $link_header) ${D}${includedir}/$dir/$(basename $link_header)
-			fi
+	if [ "${@bb.utils.filter('PACKAGECONFIG', 'legacy-headers', d)}" ]; then
+		for dir in rpc rpcsvc; do
+			install -d ${D}${includedir}/$dir
+			for link_header in ${D}${includedir}/tirpc/$dir/*; do
+				if [ -f $link_header ] &&
+				   [ ! -e ${D}${includedir}/$dir/$(basename $link_header) ]; then
+					ln -sf ../tirpc/$dir/$(basename $link_header) ${D}${includedir}/$dir/$(basename $link_header)
+				fi
+			done
 		done
-	done
-	ln -sf tirpc/netconfig.h ${D}${includedir}/netconfig.h
+		ln -sf tirpc/netconfig.h ${D}${includedir}/netconfig.h
+	fi
 }
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.21.0