kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

-R added

Browse source
This commit is contained in:
Lubomir Rintel 2006-02-07 08:14:10 +00:00 committed by Thomas Klausner
parent 58700e8ec6
commit 3be2a1b93e
5 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
grub2/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2006/01/30 01:19:42 lsed Exp $
# $NetBSD: Makefile,v 1.5 2006/02/07 08:14:10 lkundrak Exp $
DISTNAME= grub2
PKGNAME= grub2-${GRUB_VERSION}
@ -14,7 +14,7 @@ CVS_ROOT.grub2= :pserver:anonymous:@cvs.savannah.gnu.org:/sources/grub
CVS_MODULE.grub2= grub2
GNU_CONFIGURE= yes
USE_TOOLS= gmake bison
USE_TOOLS+= gmake bison
CONFLICTS= grub-*
ONLY_FOR_PLATFORM= *-*-i386

8
grub2/distinfo
View file

@ -1,13 +1,13 @@
$NetBSD: distinfo,v 1.3 2006/01/13 14:08:34 lkundrak Exp $
$NetBSD: distinfo,v 1.4 2006/02/07 08:14:10 lkundrak Exp $
SHA1 (patch-aa) = ec4f7ffd18e87c72574f62b0ffc0d31707095dc2
SHA1 (patch-ab) = e67f1b38663b6c487448358c5e575a2420485bef
SHA1 (patch-ab) = d0f2c400d8749e8ebd840b5b272a5261bb21e579
SHA1 (patch-ac) = 2e8cb268a3740c12dd647cc5a4be8573939ca08e
SHA1 (patch-ad) = 74cee31c73a628604dd1bb95d1beb1286c5e4558
SHA1 (patch-ae) = 748e75bfef78fad6bffafcf4ce267d980042cf48
SHA1 (patch-af) = 3fa7c2536aa702a6a6542280128a75dc2a901d03
SHA1 (patch-af) = 8e1c6780406c1bd624f8c46dc52f00280eec636c
SHA1 (patch-ag) = 9cb7cf6faded4cb63f92ee1768967df426e7a1a7
SHA1 (patch-ah) = e6b0a55b9c3e19368b0013646f627c0dfd875117
SHA1 (patch-ai) = e0d810b7b400cad53d3ccc8b41d21b2056424b7b
SHA1 (patch-aj) = d09d717bd737ed0707253e4a292e5a4abace2c62
SHA1 (patch-aj) = 7c0388ed12e8ccb4909b4da9882399ba177c898d
SHA1 (patch-ak) = b69aede9f29978fb7d2186caf9014e9dc2bf427d

4
grub2/patches/patch-ab
View file

@ -1,4 +1,4 @@
$NetBSD: patch-ab,v 1.2 2006/01/13 14:16:17 lkundrak Exp $
$NetBSD: patch-ab,v 1.3 2006/02/07 08:14:10 lkundrak Exp $
--- Makefile.in.orig 2006-01-03 18:58:02.000000000 +0100
+++ Makefile.in
@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.2 2006/01/13 14:16:17 lkundrak Exp $
+BUILD_CFLAGS = @BUILD_CFLAGS@
+BUILD_CPPFLAGS = @BUILD_CPPFLAGS@
+BUILD_CPPFLAGS += -I. -Iinclude -I$(srcdir)/include -DGRUB_DATADIR=\"$(pkgdatadir)\"
+BUILD_LDFLAGS = @BUILD_LDFLAGS@
+BUILD_LDFLAGS = -Wl,-R$(PREFIX)/lib @BUILD_LDFLAGS@
+
OBJCOPY = @OBJCOPY@
STRIP = @STRIP@

13
grub2/patches/patch-af
View file

@ -1,4 +1,4 @@
$NetBSD: patch-af,v 1.2 2006/01/13 14:16:17 lkundrak Exp $
$NetBSD: patch-af,v 1.3 2006/02/07 08:14:10 lkundrak Exp $
--- configure.orig 2006-01-03 18:58:02.000000000 +0100
+++ configure
@ -222,7 +222,16 @@ $NetBSD: patch-af,v 1.2 2006/01/13 14:16:17 lkundrak Exp $
# Check for headers.
@@ -7163,10 +7346,14 @@ s,@LD@,$LD,;t t
@@ -6979,6 +7162,8 @@ do
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+ # Avoid regenerating for rechecks on pkgsrc
+ exit 0
ac_cs_recheck=: ;;
--version | --vers* | -V )
echo "$ac_cs_version"; exit 0 ;;
@@ -7163,10 +7348,14 @@ s,@LD@,$LD,;t t
s,@ac_ct_LD@,$ac_ct_LD,;t t
s,@RUBY@,$RUBY,;t t
s,@BUILD_CC@,$BUILD_CC,;t t

4
grub2/patches/patch-aj
View file

@ -1,6 +1,6 @@
$NetBSD: patch-aj,v 1.2 2006/01/13 14:16:17 lkundrak Exp $
$NetBSD: patch-aj,v 1.3 2006/02/07 08:14:10 lkundrak Exp $
--- util/i386/pc/grub-install.in.orig 2005-08-07 19:12:52.000000000 +0200
--- util/i386/pc/grub-install.in.orig 2006-01-25 01:11:36.000000000 +0100
+++ util/i386/pc/grub-install.in
@@ -21,6 +21,7 @@
prefix=@prefix@