Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 7fe7d9e
Finish rebundling libyaml
Baptiste Daroussin committed 12 years ago
commit 7fe7d9ea0038d0a7a156280993cb6347cfff7055
parent 179e89e
4 files changed +1 -18
modified libpkg/Makefile
@@ -83,12 +83,8 @@ CFLAGS+= -I. \
		-I${.CURDIR}/../external/sqlite \

		-I${.CURDIR}/../external/uthash
- 
.if !exists(/usr/include/bsdyml.h)
- 
CFLAGS+=	-DBUNDLED_YAML -I ${.CURDIR}/../external/libyaml/include
+ 
CFLAGS+=	-I ${.CURDIR}/../external/libyaml/include

LDADD+=		-L../external/libyaml -lyaml
- 
.else
- 
LDADD+=		-lbsdyml
- 
.endif



.if defined(WITH_BUNDLED_LIBELF)

CFLAGS+=	-I${.CURDIR}/../external/libelf \
modified libpkg/pkg_config.c
@@ -38,12 +38,7 @@
#include <stdlib.h>

#include <string.h>

#include <sysexits.h>
-
- 
#ifdef BUNDLED_YAML

#include <yaml.h>
- 
#else
- 
#include <bsdyml.h>
- 
#endif



#include "pkg.h"

#include "private/pkg.h"
modified libpkg/pkg_manifest.c
@@ -34,11 +34,7 @@
#include <stdbool.h>

#include <stdlib.h>

#include <string.h>
- 
#ifdef BUNDLED_YAML

#include <yaml.h>
- 
#else
- 
#include <bsdyml.h>
- 
#endif



#include "pkg.h"

#include "private/event.h"
modified libpkg/pkg_ports.c
@@ -39,11 +39,7 @@
#include <string.h>

#include <stringlist.h>

#include <unistd.h>
- 
#ifdef BUNDLED_YAML

#include <yaml.h>
- 
#else
- 
#include <bsdyml.h>
- 
#endif

#include <uthash.h>



#include "pkg.h"