Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › d70fd94
Fix pkg compatibility.
Vsevolod Stakhov committed 11 years ago
commit d70fd94ad10b175ed0349ddc33edfa4fd045e2ce
parent 7b75c09
4 files changed +12 -4
modified src/Makefile.am
@@ -47,8 +47,7 @@ pkg_CFLAGS= -I$(top_srcdir)/libpkg \
			-I$(top_srcdir)/external/libsbuf \

			-I$(top_srcdir)/external/uthash \

			-I$(top_srcdir)/external/expat/lib \
- 
			-DGITHASH=\"$(GIT_HEAD)\" \
- 
			-Werror
+ 
			-DGITHASH=\"$(GIT_HEAD)\" 

pkg_static_SOURCES=

pkg_static_LDADD= $(top_builddir)/libpkg/libpkg_static.la \

			$(top_builddir)/compat/libbsd_compat.la \
modified src/pkgcli.h
@@ -28,6 +28,9 @@
#ifndef _PKGCLI_H

#define _PKGCLI_H
+ 
#include <stdint.h>
+ 
#include <bsd_compat.h>
+ 


#define pkg_warnx(fmt, ...) pkg_fprintf(stderr, "%s" fmt, getprogname(), __VA_ARGS__, -1)



extern bool quiet;
modified src/repo.c
@@ -24,16 +24,22 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */
+ 
#include <bsd_compat.h>

#include <getopt.h>

#include <signal.h>

#include <sysexits.h>

#include <stdio.h>

#include <string.h>
+
+ 
#ifdef HAVE_BSD_READPASSPHRASE_H
+ 
#include <bsd/readpassphrase.h>
+ 
#else

#include <readpassphrase.h>
+ 
#endif
+ 


#include <unistd.h>



#include <pkg.h>
- 


#include "pkgcli.h"



void
modified src/utils.c
@@ -64,7 +64,7 @@ query_tty_yesno(bool r, const char *msg, ...)
	FILE	*tty;

	int	 tty_flags = O_RDWR;
- 
#if !defined(__DragonFly__) && !defined(__APPLE__)
+ 
#ifdef O_TTY_INIT

	tty_flags |= O_TTY_INIT;

#endif

	tty_fd = open(_PATH_TTY, tty_flags);