Browse Source

reverted HEAD:1978

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1982 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Rene Rebe 21 years ago
parent
commit
0cb3aff2e0
3 changed files with 88 additions and 2 deletions
  1. +48
    -0
      package/base/mine/hotfix.patch
  2. +2
    -2
      package/base/mine/mine.desc
  3. +38
    -0
      package/base/mine/static.patch

+ 48
- 0
package/base/mine/hotfix.patch

@ -0,0 +1,48 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/mine/hotfix.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./Makefile.orig 2003-09-29 00:26:40.000000000 +0200
+++ ./Makefile 2003-09-29 00:26:42.000000000 +0200
@@ -79,10 +79,10 @@
all: $(targets)
mine: $(MINE_ALL_OBJS)
- gcc $(MINE_ALL_OBJS) $(MINE_LDFLAGS) -o mine
+ $(CC) $(MINE_ALL_OBJS) $(MINE_LDFLAGS) -o mine
gasgui: $(GAS_OBJ)
- gcc $(GAS_OBJ) -ldialog -lcurses -lm -o gasgui
+ $(CC) $(GAS_OBJ) -ldialog -lcurses -lm -o gasgui
install:
install mine $(sysprefix)/bin/mine
--- ./selector.c (revision 15)
+++ ./selector.c (revision 16)
@@ -551,7 +551,7 @@
}
if ( !pkgcount && !bigmain ) {
- char *dirname = "All Packages";
+ char *dirname = "all";
struct directory_entry * e;
if ( instmenu1() == 1 ) dirname = "base";
for (e = rootdir->list; e != NULL; e = e->next) {

+ 2
- 2
package/base/mine/mine.desc

@ -34,8 +34,8 @@
[L] GPL
[S] Stable
[V] 0.17
[V] 0.15
[P] X 01---5---9 229.000
[D] 3679635708 mine-0.17.tar.bz2 http://www.rocklinux.net/people/clifford/GEM-MINE/
[D] 1122719992 mine-0.15.tar.bz2 http://www.rocklinux.net/people/clifford/GEM-MINE/

+ 38
- 0
package/base/mine/static.patch

@ -0,0 +1,38 @@
--- ./Makefile.orig 2003-10-18 11:26:04.000000000 +0300
+++ ./Makefile 2003-10-18 11:26:13.000000000 +0300
@@ -23,7 +23,6 @@
MINE_VER = 0.15
MINE_OBJ = create.o install.o remove.o pkglist.o
MINE_OBJ += showfile.o showkey.o memdb.o md5.o md5sum.o mine.o
-MINE_LDFLAGS = -static
# GAS
#
@@ -63,7 +62,7 @@
# What do we want to build
#
-targets = mine
+targets = mine mine.static
ifeq ($(USE_GAS), 1)
targets += gasgui
endif
@@ -79,13 +78,17 @@
all: $(targets)
mine: $(MINE_ALL_OBJS)
- $(CC) $(MINE_ALL_OBJS) $(MINE_LDFLAGS) -o mine
+ $(CC) $(MINE_ALL_OBJS) -o mine
+
+mine.static:
+ $(CC) $(MINE_ALL_OBJS) -static -o mine.static
gasgui: $(GAS_OBJ)
$(CC) $(GAS_OBJ) -ldialog -lcurses -lm -o gasgui
install:
install mine $(sysprefix)/bin/mine
+ install mine.static $(sysprefix)/bin/mine.static
install tarbz2gem.sh $(prefix)/sbin/tarbz2gem
install rocket.sh $(prefix)/sbin/rocket
ifeq ($(USE_GAS), 1)

Loading…
Cancel
Save