Attachment 2142 Details for Bug 1996 – Allow using a cross-architecture pkg-config

[patch] Allow using a cross-architecture pkg-config

cross-pkg-config.patch (text/plain), 1.49 KB, created by Colin Watson on 2012-04-02 20:17:00 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Watson

Created: 2012-04-02 20:17:00 AEST

Size: 1.49 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /cvs/openssh/configure.ac,v
>retrieving revision 1.487
>diff -p -u -r1.487 configure.ac
>--- configure.ac	23 Feb 2012 23:40:43 -0000	1.487
>+++ configure.ac	2 Apr 2012 10:15:08 -0000
>@@ -1361,7 +1361,7 @@ AC_ARG_WITH([libedit],
> 	[  --with-libedit[[=PATH]]   Enable libedit support for sftp],
> 	[ if test "x$withval" != "xno" ; then
> 		if test "x$withval" = "xyes" ; then
>-			AC_PATH_PROG([PKGCONFIG], [pkg-config], [no])
>+			AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no])
> 			if test "x$PKGCONFIG" != "xno"; then
> 				AC_MSG_CHECKING([if $PKGCONFIG knows about libedit])
> 			 	if "$PKGCONFIG" libedit; then
>Index: contrib/Makefile
>===================================================================
>RCS file: /cvs/openssh/contrib/Makefile,v
>retrieving revision 1.3
>diff -p -u -r1.3 Makefile
>--- contrib/Makefile	26 Mar 2010 00:16:39 -0000	1.3
>+++ contrib/Makefile	2 Apr 2012 10:15:08 -0000
>@@ -1,3 +1,5 @@
>+PKG_CONFIG = pkg-config
>+
> all:
> 	@echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2"
> 
>@@ -7,9 +9,9 @@ gnome-ssh-askpass1: gnome-ssh-askpass1.c
> 		`gnome-config --libs gnome gnomeui`
> 
> gnome-ssh-askpass2: gnome-ssh-askpass2.c
>-	$(CC) `pkg-config --cflags gtk+-2.0` \
>+	$(CC) `$(PKG_CONFIG) --cflags gtk+-2.0` \
> 		gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
>-		`pkg-config --libs gtk+-2.0 x11`
>+		`$(PKG_CONFIG) --libs gtk+-2.0 x11`
> 
> clean:
> 	rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass

Actions: View | Diff

Attachments on bug 1996: 2142