gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-util/cscope: Fix direct call of pkg-config in configure script

Browse Source 
Signed-off-by: Jakub Czapiga <jacz@semihalf.com>
Closes: https://github.com/gentoo/gentoo/pull/23883
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Jakub Czapiga
2022-01-20 10:40:10 +01:00
committed by Sam James
parent 10f043bab1
commit 19edcd377f
4 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dev-util/cscope/cscope-15.8a-r2.ebuild
View File

@@ -26,6 +26,7 @@ SITEFILE="50${PN}-gentoo.el"
src_prepare() {
eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305
eapply "${FILESDIR}/${PN}-15.6-darwin.patch"
eapply "${FILESDIR}/${PN}-15.8a-pkgconfig.patch"
eapply_user
mv configure.{in,ac} || die
eautoreconf # prevent maintainer mode later on

1
dev-util/cscope/cscope-15.9.ebuild
View File

@@ -25,6 +25,7 @@ SITEFILE="50${PN}-gentoo.el"
src_prepare() {
eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305
eapply "${FILESDIR}/${PN}-15.9-pkgconfig.patch"
eapply_user
mv configure.{in,ac} || die
eautoreconf # prevent maintainer mode later on

28
dev-util/cscope/files/cscope-15.8a-pkgconfig.patch Normal file
View File

@@ -0,0 +1,28 @@
--- a/configure.in
+++ b/configure.in
@@ -22,6 +22,7 @@ if test "x$LEX" = "xlex" ; then AC_DEFINE(USING_LEX, 1,
[Define this if the scanner is run through lex, not flex])
fi
AC_PROG_YACC
+PKG_PROG_PKG_CONFIG
dnl === BEGIN CURSES CHECK
dnl Curses detection: Munged from Midnight Commander's configure.in
@@ -363,7 +364,7 @@ dnl Check for a GNOME installation
AC_DEFUN([AC_CHECK_GNOME],[
has_gnome=false
AC_CHECK_PROG(gnome1, gnome-config, true)
- AC_CHECK_PROG(gnome2, pkg-config, true)
+ AC_CHECK_PROG(gnome2, $PKG_CONFIG, true)
if test x$gnome1 = xtrue; then
has_gnome=true
@@ -373,7 +374,7 @@ AC_DEFUN([AC_CHECK_GNOME],[
has_gnome=true
fi
- AM_CONDITIONAL(USING_GNOME2, pkg-config --exists gtk+-2.0)
+ AM_CONDITIONAL(USING_GNOME2, $PKG_CONFIG --exists gtk+-2.0)
AM_CONDITIONAL(HAS_GNOME, test "$has_gnome" = true)
AM_CONDITIONAL(GNOME_LINUX, test "$host_os" = Linux)
])

28
dev-util/cscope/files/cscope-15.9-pkgconfig.patch Normal file
View File

@@ -0,0 +1,28 @@
--- a/configure.in
+++ b/configure.in
@@ -18,6 +18,7 @@ if test "x$LEX" = "xlex" ; then AC_DEFINE(USING_LEX, 1,
[Define this if the scanner is run through lex, not flex])
fi
AC_PROG_YACC
+PKG_PROG_PKG_CONFIG
AC_SYS_LARGEFILE
@@ -361,7 +362,7 @@ dnl Check for a GNOME installation
AC_DEFUN([AC_CHECK_GNOME],[
has_gnome=false
AC_CHECK_PROG(gnome1, gnome-config, true)
- AC_CHECK_PROG(gnome2, pkg-config, true)
+ AC_CHECK_PROG(gnome2, $PKG_CONFIG, true)
if test x$gnome1 = xtrue; then
has_gnome=true
@@ -371,7 +372,7 @@ AC_DEFUN([AC_CHECK_GNOME],[
has_gnome=true
fi
- AM_CONDITIONAL(USING_GNOME2, pkg-config --exists gtk+-2.0)
+ AM_CONDITIONAL(USING_GNOME2, $PKG_CONFIG --exists gtk+-2.0)
AM_CONDITIONAL(HAS_GNOME, test "$has_gnome" = true)
AM_CONDITIONAL(GNOME_LINUX, test "$host_os" = Linux)
])