Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Jan 2015 00:11:11 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r276898 - in head: contrib/xz contrib/xz/src/liblzma lib/liblzma
Message-ID:  <201501100011.t0A0BBoj072372@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sat Jan 10 00:11:10 2015
New Revision: 276898
URL: https://svnweb.freebsd.org/changeset/base/276898

Log:
  Install the liblzma pkg-config file
  
  MFC after:	1 week

Added:
  head/contrib/xz/src/liblzma/liblzma.pc.in
     - copied unchanged from r276897, vendor/xz/dist/src/liblzma/liblzma.pc.in
Modified:
  head/contrib/xz/FREEBSD-Xlist
  head/lib/liblzma/Makefile
Directory Properties:
  head/contrib/xz/   (props changed)

Modified: head/contrib/xz/FREEBSD-Xlist
==============================================================================
--- head/contrib/xz/FREEBSD-Xlist	Sat Jan 10 00:07:34 2015	(r276897)
+++ head/contrib/xz/FREEBSD-Xlist	Sat Jan 10 00:11:10 2015	(r276898)
@@ -32,7 +32,6 @@ macosx/
 makefile.am
 po/
 src/*/*.rc
-src/liblzma/liblzma.pc.in
 src/scripts/
 tests/
 version.sh

Copied: head/contrib/xz/src/liblzma/liblzma.pc.in (from r276897, vendor/xz/dist/src/liblzma/liblzma.pc.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/contrib/xz/src/liblzma/liblzma.pc.in	Sat Jan 10 00:11:10 2015	(r276898, copy of r276897, vendor/xz/dist/src/liblzma/liblzma.pc.in)
@@ -0,0 +1,19 @@
+#
+# Author: Lasse Collin
+#
+# This file has been put into the public domain.
+# You can do whatever you want with this file.
+#
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: liblzma
+Description: General purpose data compression library
+URL: @PACKAGE_URL@
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir}
+Libs: -L${libdir} -llzma
+Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@

Modified: head/lib/liblzma/Makefile
==============================================================================
--- head/lib/liblzma/Makefile	Sat Jan 10 00:07:34 2015	(r276897)
+++ head/lib/liblzma/Makefile	Sat Jan 10 00:11:10 2015	(r276898)
@@ -117,7 +117,16 @@ SRCS+=	simple_coder.c \
 	arm.c \
 	armthumb.c \
 	sparc.c
-		
+
+.PATH: ${LZMADIR}
+
+VERSION_MAJOR!=	awk '$$1 == "\#define" && $$2 == "LZMA_VERSION_MAJOR" {print $$3 } ' \
+			${LZMADIR}/api/lzma/version.h
+VERSION_MINOR!=	awk '$$1 == "\#define" && $$2 == "LZMA_VERSION_MINOR" {print $$3 } ' \
+			${LZMADIR}/api/lzma/version.h
+VERSION_PATCH!=	awk '$$1 == "\#define" && $$2 == "LZMA_VERSION_PATCH" {print $$3 } ' \
+			${LZMADIR}/api/lzma/version.h
+
 WARNS?=	3
 
 CFLAGS+=	-DHAVE_CONFIG_H \
@@ -137,4 +146,21 @@ VERSION_DEF=	${.CURDIR}/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 CFLAGS+=	-DSYMBOL_VERSIONING
 
+CLEANFILES+=	liblzma.pc
+
+all: liblzma.pc
+liblzma.pc: liblzma.pc.in
+	@sed -e 's,@prefix@,/usr,g ; \
+		s,@exec_prefix@,/usr,g  ; \
+		s,@libdir@,${LIBDIR},g ; \
+		s,@includedir@,${INCLUDEDIR},g ; \
+		s,@PACKAGE_URL@,http://tukaani.org/xz/,g ; \
+		s,@PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \
+		s,@PTHREAD_CFLAGS@,,g ; \
+		s,@PTHREAD_LIBS@,,g' ${.ALLSRC} > ${.TARGET}
+
+beforeinstall:
+	@${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+		liblzma.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
+
 .include <bsd.lib.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501100011.t0A0BBoj072372>