diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-03 21:33:25 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-03 21:59:03 +0200 |
| commit | 32a0454d3c495b12824ef4a0d0341237302d148a (patch) | |
| tree | 9acc870d089b0028cecdfb1846b828ae4bd38910 /package/libnss | |
| parent | f9686563b4fd3eed22e26105f7c440f0b74fcac1 (diff) | |
| parent | dafa32b3bd75e9d155d075c796fa5b0ecbb9b11b (diff) | |
| download | buildroot-novena-32a0454d3c495b12824ef4a0d0341237302d148a.tar.gz buildroot-novena-32a0454d3c495b12824ef4a0d0341237302d148a.zip | |
Merge branch 'next'
Conflicts:
package/e2fsprogs/e2fsprogs.mk
package/libfuse/libfuse.mk
package/multimedia/mpd/mpd.mk
package/smartmontools/smartmontools.mk
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/libnss')
| -rw-r--r-- | package/libnss/libnss.mk | 8 | ||||
| -rw-r--r-- | package/libnss/nss.pc.in | 11 |
2 files changed, 19 insertions, 0 deletions
diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index f7fd6820c..84fc14996 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -49,6 +49,10 @@ define LIBNSS_INSTALL_STAGING_CMDS $(@D)/$(LIBNSS_DISTDIR)/public/nss/* $(INSTALL) -m 755 -t $(STAGING_DIR)/usr/lib/ \ $(@D)/$(LIBNSS_DISTDIR)/lib/*.a + $(INSTALL) -D -m 0644 $(TOPDIR)/package/libnss/nss.pc.in \ + $(STAGING_DIR)/usr/lib/pkgconfig/nss.pc + $(SED) 's/@VERSION@/$(LIBNSS_VERSION)/g;' \ + $(STAGING_DIR)/usr/lib/pkgconfig/nss.pc endef define LIBNSS_INSTALL_TARGET_CMDS @@ -59,6 +63,10 @@ define LIBNSS_INSTALL_TARGET_CMDS $(@D)/$(LIBNSS_DISTDIR)/public/nss/* $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/lib/ \ $(@D)/$(LIBNSS_DISTDIR)/lib/*.a + $(INSTALL) -D -m 0644 $(TOPDIR)/package/libnss/nss.pc.in \ + $(TARGET_DIR)/usr/lib/pkgconfig/nss.pc + $(SED) 's/@VERSION@/$(LIBNSS_VERSION)/g;' \ + $(TARGET_DIR)/usr/lib/pkgconfig/nss.pc endef define LIBNSS_CLEAN_CMDS diff --git a/package/libnss/nss.pc.in b/package/libnss/nss.pc.in new file mode 100644 index 000000000..e27783f64 --- /dev/null +++ b/package/libnss/nss.pc.in @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include/nss + +Name: NSS +Description: Mozilla Network Security Services +Version: @VERSION@ +Requires: nspr +Libs: -L${libdir} -lnss3 -lnssutil3 -lsmime3 -lssl3 +Cflags: -I${includedir} |