Skip to content

Commit ebcc920

Browse files
committed
Added unit pkg-config file.
1 parent 47ff510 commit ebcc920

File tree

6 files changed

+50
-1
lines changed

6 files changed

+50
-1
lines changed

auto/help

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ cat << END
2020
--modulesdir=DIR default: "\$libdir/unit/modules"
2121
--datarootdir=DIR default: "\$prefix/share"
2222
--mandir=DIR default: "\$datarootdir/man"
23+
--pkgconfigdir=DIR default: "\$datarootdir/pkgconfig"
2324
--localstatedir=DIR default: "\$prefix/var"
2425
--statedir=DIR default: "\$localstatedir/lib/unit"
2526
--runstatedir=DIR default: "\$localstatedir/run/unit"

auto/make

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ $NXT_BUILD_DIR/lib/$NXT_LIB_SHARED: \$(NXT_LIB_OBJS)
9494
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC: \$(NXT_LIB_OBJS)
9595
$NXT_STATIC_LINK \$@ \$(NXT_LIB_OBJS)
9696

97-
$NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC: \$(NXT_LIB_UNIT_OBJS)
97+
$NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC: \$(NXT_LIB_UNIT_OBJS) \\
98+
$NXT_BUILD_DIR/share/pkgconfig/unit.pc \\
99+
$NXT_BUILD_DIR/share/pkgconfig/unit-uninstalled.pc
98100
$NXT_STATIC_LINK \$@ \$(NXT_LIB_UNIT_OBJS)
99101

100102
END
@@ -397,6 +399,10 @@ libunit-install: $NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC
397399
|| install -d \$(DESTDIR)$NXT_LIBDIR
398400
install -p -m u=rw,go=r $NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC \
399401
\$(DESTDIR)$NXT_LIBDIR/
402+
test -d \$(DESTDIR)$NXT_PKGCONFIGDIR \
403+
|| install -d \$(DESTDIR)$NXT_PKGCONFIGDIR
404+
install -p -m u=rw,go=r $NXT_BUILD_DIR/share/pkgconfig/unit.pc \
405+
\$(DESTDIR)$NXT_PKGCONFIGDIR/
400406
test -d \$(DESTDIR)$NXT_INCLUDEDIR \
401407
|| install -d \$(DESTDIR)$NXT_INCLUDEDIR
402408
install -p -m u=rw,go=r src/nxt_unit.h \
@@ -414,6 +420,8 @@ libunit-install: $NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC
414420
libunit-uninstall:
415421
rm -f \$(DESTDIR)$NXT_LIBDIR/$NXT_LIB_UNIT_STATIC
416422
@rmdir -p \$(DESTDIR)$NXT_LIBDIR 2>/dev/null || true
423+
rm -f \$(DESTDIR)$NXT_PKGCONFIGDIR/unit.pc
424+
@rmdir -p \$(DESTDIR)$NXT_PKGCONFIGDIR 2>/dev/null || true
417425
rm -f \$(DESTDIR)$NXT_INCLUDEDIR/nxt_unit.h \
418426
\$(DESTDIR)$NXT_INCLUDEDIR/nxt_unit_field.h \
419427
\$(DESTDIR)$NXT_INCLUDEDIR/nxt_unit_request.h \
@@ -428,6 +436,31 @@ libunit-uninstall:
428436

429437
END
430438

439+
# pkg-config files
440+
441+
cat << END >> $NXT_MAKEFILE
442+
443+
$NXT_BUILD_DIR/share/pkgconfig/unit.pc: src/unit.pc.in
444+
sed -e "s|@PREFIX@|$NXT_PREFIX|" \\
445+
-e "s|@LIBDIR@|$NXT_LIBDIR|" \\
446+
-e "s|@CFLAGS@|-I$NXT_INCLUDEDIR|" \\
447+
-e "s|@VERSION@|\$(NXT_VERSION)|" \\
448+
-e "s|@EXTRA_LIBS@|$NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS|" \\
449+
-e "s|@CONFARGS@|$(echo $NXT_CONFIGURE_OPTIONS | sed -e 's| -pie||' -e 's| --njs||')|" \\
450+
-e "s|@MODULESDIR@|$NXT_MODULESDIR|" \\
451+
< src/unit.pc.in > \$@
452+
453+
$NXT_BUILD_DIR/share/pkgconfig/unit-uninstalled.pc: src/unit.pc.in
454+
sed -e "s|@PREFIX@|$(pwd)/$NXT_BUILD_DIR|" \\
455+
-e "s|@LIBDIR@|$(pwd)/$NXT_BUILD_DIR/lib|" \\
456+
-e "s|@CFLAGS@|-I$(pwd)/src -I$(pwd)$NXT_BUILD_DIR/include|" \\
457+
-e "s|@VERSION@|\$(NXT_VERSION)|" \\
458+
-e "s|@EXTRA_LIBS@|$NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS|" \\
459+
-e "s|@CONFARGS@|$(echo $NXT_CONFIGURE_OPTIONS | sed -e 's| -pie||' -e 's| --njs||')|" \\
460+
< src/unit.pc.in > \$@
461+
462+
END
463+
431464
# Makefile.
432465
# *.dSYM is MacOSX Clang debug information.
433466

auto/options

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ do
7373
;;
7474
--datarootdir=*) NXT_DATAROOTDIR="$value" ;;
7575
--mandir=*) NXT_MANDIR="$value" ;;
76+
--pkgconfigdir=*) NXT_PKGCONFIGDIR="$value" ;;
7677
--localstatedir=*) NXT_LOCALSTATEDIR="$value" ;;
7778
--statedir=*) NXT_STATEDIR="$value" ;;
7879
--state=*)
@@ -158,6 +159,7 @@ NXT_MODULESDIR="${NXT_MODULESDIR-"$NXT_LIBDIR/unit/modules"}"
158159

159160
NXT_DATAROOTDIR="${NXT_DATAROOTDIR-"$NXT_PREFIX/share"}"
160161
NXT_MANDIR="${NXT_MANDIR-"$NXT_DATAROOTDIR/man"}"
162+
NXT_PKGCONFIGDIR="${NXT_PKGCONFIGDIR-"$NXT_DATAROOTDIR/pkgconfig"}"
161163

162164
NXT_LOCALSTATEDIR="${NXT_LOCALSTATEDIR-"$NXT_PREFIX/var"}"
163165
NXT_STATEDIR="${NXT_STATEDIR-"$NXT_LOCALSTATEDIR/lib/unit"}"

auto/summary

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Unit configuration summary:
1111
sbin directory: ............ "$NXT_SBINDIR"
1212
lib directory: ............. "$NXT_LIBDIR"
1313
include directory: ......... "$NXT_INCLUDEDIR"
14+
pkgconfig directory: ....... "$NXT_PKGCONFIGDIR"
1415
man pages directory: ....... "$NXT_MANDIR"
1516
modules directory: ......... "$NXT_MODULESDIR"
1617
state directory: ........... "$NXT_STATEDIR"

configure

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ mkdir -p $NXT_BUILD_DIR/lib
6262
mkdir -p $NXT_BUILD_DIR/lib/unit/modules
6363
mkdir -p $NXT_BUILD_DIR/sbin
6464
mkdir -p $NXT_BUILD_DIR/share/man/man8
65+
mkdir -p $NXT_BUILD_DIR/share/pkgconfig
6566
mkdir -p $NXT_BUILD_DIR/src
6667
mkdir -p $NXT_BUILD_DIR/src/test
6768
mkdir -p $NXT_BUILD_DIR/var/lib/unit

src/unit.pc.in

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
prefix=@PREFIX@
2+
libdir=@LIBDIR@
3+
confargs=@CONFARGS@
4+
modulesdir=@MODULESDIR@
5+
6+
Name: unit
7+
Description: library to embed Unit
8+
Version: @VERSION@
9+
URL: https://unit.nginx.org
10+
Cflags: @CFLAGS@
11+
Libs: -L${libdir} -lunit @EXTRA_LIBS@

0 commit comments

Comments
 (0)