OBS User unknown 2006-12-18 23:17:05 +00:00 committed by Git OBS Bridge
commit 86613e5112
9 changed files with 695 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

3
make-3.81.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8
size 1151445

View File

@ -0,0 +1,16 @@
make searches for -lmoo targets in /lib and /usr/lib after mangling
them with .LIBPATTERNS into libmoo.so
This patch extends to teh search path to /lib64/ and /usr/lib64
--- remake.c 2001/12/11 15:59:03 1.1
+++ remake.c 2001/12/11 16:01:01
@@ -1252,6 +1252,8 @@
static char *dirs[] =
{
#ifndef _AMIGA
+ "/lib64",
+ "/usr/lib64",
"/lib",
"/usr/lib",
#endif

259
make-memory-hog-2.diff Normal file
View File

@ -0,0 +1,259 @@
GNU make 3.80 is a HUGE memory hog. It calls xstrdup to build
dependency list. gnu-src-gcc.deps in libjava has 3000+ targets depend
the same 3000+ files, whose filenames are more than 260K. For this
dependency alone, make takes 3000*260K == 761MB.
This patch is a quick hack. It reduces the memory from 1.6GB to around
600MB for "make -f gnu-src-gcc.deps". I think make should use a better
memory management for strings. If my approach is OK, I can try to
use it through out make.
H.J.
----
--- make-3.80/file.c.memory 2002-10-03 19:13:42.000000000 -0700
+++ make-3.80/file.c 2006-02-01 10:45:32.000000000 -0800
@@ -434,7 +434,7 @@ snap_deps ()
if (d->file == 0)
d->file = enter_file (d->name);
else
- free (d->name);
+ hash_strfree (d->name);
d->name = 0;
}
free (file_slot_0);
--- make-3.80/implicit.c.memory 2002-09-04 00:26:19.000000000 -0700
+++ make-3.80/implicit.c 2006-02-01 10:45:32.000000000 -0800
@@ -539,7 +539,7 @@ pattern_search (file, archive, depth, re
dep->file = enter_file (dep->name);
/* enter_file uses dep->name _if_ we created a new file. */
if (dep->name != dep->file->name)
- free (dep->name);
+ hash_strfree (dep->name);
dep->name = 0;
dep->file->tried_implicit |= dep->changed;
}
--- make-3.80/main.c.memory 2002-08-09 18:27:17.000000000 -0700
+++ make-3.80/main.c 2006-02-01 10:45:32.000000000 -0800
@@ -501,6 +501,7 @@ initialize_global_hash_tables ()
init_hash_files ();
hash_init_directories ();
hash_init_function_table ();
+ init_hash_strings ();
}
static struct file *
--- make-3.80/make.h.memory 2002-09-11 09:55:44.000000000 -0700
+++ make-3.80/make.h 2006-02-01 10:45:32.000000000 -0800
@@ -427,6 +427,11 @@ extern char *find_char_unquote PARAMS ((
extern char *find_percent PARAMS ((char *));
extern FILE *open_tmpfile PARAMS ((char **, const char *));
+extern void init_hash_strings PARAMS ((void));
+extern char *hash_strdup PARAMS ((const char *));
+extern char *hash_savestring PARAMS ((const char *, unsigned int));
+extern void hash_strfree PARAMS ((char *));
+
#ifndef NO_ARCHIVES
extern int ar_name PARAMS ((char *));
extern void ar_parse_name PARAMS ((char *, char **, char **));
--- make-3.80/misc.c.memory 2002-09-12 15:15:58.000000000 -0700
+++ make-3.80/misc.c 2006-02-01 11:05:44.000000000 -0800
@@ -18,8 +18,10 @@ along with GNU Make; see the file COPYIN
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <assert.h>
#include "make.h"
#include "dep.h"
+#include "hash.h"
#include "debug.h"
/* Variadic functions. We go through contortions to allow proper function
@@ -564,7 +566,7 @@ copy_dep_chain (d)
c = (struct dep *) xmalloc (sizeof (struct dep));
bcopy ((char *) d, (char *) c, sizeof (struct dep));
if (c->name != 0)
- c->name = xstrdup (c->name);
+ c->name = hash_strdup (c->name);
c->next = 0;
if (firstnew == 0)
firstnew = lastnew = c;
@@ -891,3 +893,154 @@ atomic_readdir(dir)
}
#endif /* HAVE_BROKEN_RESTART */
+
+/* Hash table of duplicated strings. */
+
+struct hash_string
+{
+ char *string;
+ unsigned int count;
+};
+
+static unsigned long
+string_hash_1 (key)
+ const void *key;
+{
+ return_ISTRING_HASH_1 (((const struct hash_string *) key)->string);
+}
+
+static unsigned long
+string_hash_2 (key)
+ const void *key;
+{
+ return_ISTRING_HASH_2 (((const struct hash_string *) key)->string);
+}
+
+static int
+string_hash_cmp (x, y)
+ const void *x;
+ const void *y;
+{
+ return_ISTRING_COMPARE (((const struct hash_string *) x)->string,
+ ((const struct hash_string *) y)->string);
+}
+
+static struct hash_table strings;
+
+void
+init_hash_strings ()
+{
+ hash_init (&strings, 1000, string_hash_1, string_hash_2,
+ string_hash_cmp);
+}
+
+/* Keep track duplicated string and return the old one if exists. */
+
+char *
+hash_strdup (ptr)
+ const char *ptr;
+{
+ struct hash_string *h, key;
+
+ if (*ptr == '\0')
+ return "";
+
+ key.string = (char *) ptr;
+ key.count = 0;
+ h = (struct hash_string *) hash_find_item (&strings, &key);
+ if (h == NULL)
+ {
+ char *result = (char *) malloc (strlen (ptr) + 1);
+
+ if (result == NULL)
+ fatal (NILF, _("virtual memory exhausted"));
+
+ strcpy (result, ptr);
+
+ h = (struct hash_string *) malloc (sizeof (struct hash_string));
+ if (h == NULL)
+ fatal (NILF, _("virtual memory exhausted"));
+
+ h->string = result;
+ h->count = 1;
+ hash_insert (&strings, h);
+ }
+ else
+ {
+ h->count++;
+ assert (h->count != 0);
+ }
+
+ return h->string;
+}
+
+char *
+hash_savestring (str, length)
+ const char *str;
+ unsigned int length;
+{
+ struct hash_string *h, key;
+
+ if (length == 0 || *str == '\0')
+ return "";
+
+ key.string = alloca (length + 1);
+ key.count = 0;
+ bcopy (str, key.string, length);
+ key.string [length] = '\0';
+
+ h = (struct hash_string *) hash_find_item (&strings, &key);
+ if (h == NULL)
+ {
+ char *out = (char *) xmalloc (length + 1);
+ bcopy (str, out, length);
+ out[length] = '\0';
+
+ h = (struct hash_string *) malloc (sizeof (struct hash_string));
+ if (h == NULL)
+ fatal (NILF, _("virtual memory exhausted"));
+
+ h->string = out;
+ h->count = 1;
+ hash_insert (&strings, h);
+ }
+ else
+ {
+ h->count++;
+ assert (h->count != 0);
+ }
+
+ return h->string;
+}
+
+void
+hash_strfree (ptr)
+ char *ptr;
+{
+ struct hash_string *h, key;
+
+ if (*ptr == '\0')
+ return;
+
+ key.string = ptr;
+ key.count = 0;
+ h = (struct hash_string *) hash_find_item (&strings, &key);
+
+ /* Check if string comes from hash_strdup or hash_savestring. */
+ if (h == NULL || h->string != ptr)
+ {
+ free (ptr);
+ return;
+ }
+
+ h->count--;
+ if (h->count == 0)
+ {
+ struct hash_string *d;
+
+ d = hash_delete (&strings, h);
+ assert (d == h);
+ free (h->string);
+ free (h);
+ }
+}
--- make-3.80/read.c.memory 2006-02-01 10:45:32.000000000 -0800
+++ make-3.80/read.c 2006-02-01 10:45:32.000000000 -0800
@@ -1871,8 +1871,8 @@ record_files (filenames, pattern, patter
fatal (flocp,
_("target `%s' leaves prerequisite pattern empty"),
name);
- free (d->name);
- d->name = savestring (buffer, o - buffer);
+ hash_strfree (d->name);
+ d->name = hash_savestring (buffer, o - buffer);
}
}
}
@@ -2017,7 +2017,7 @@ record_files (filenames, pattern, patter
while (d != 0)
{
struct dep *nextd = d->next;
- free (d->name);
+ hash_strfree (d->name);
free ((char *)d);
d = nextd;
}

View File

@ -0,0 +1,47 @@
diff -ur ../make-3.81.orig/tests/scripts/features/parallelism ./tests/scripts/features/parallelism
--- ../make-3.81.orig/tests/scripts/features/parallelism 2006-06-07 12:55:53.000000000 +0200
+++ ./tests/scripts/features/parallelism 2006-06-07 13:04:04.000000000 +0200
@@ -27,9 +27,9 @@
run_make_test("
all : def_1 def_2 def_3
-def_1 : ; \@echo ONE; $sleep_command 3 ; echo TWO
-def_2 : ; \@$sleep_command 2 ; echo THREE
-def_3 : ; \@$sleep_command 1 ; echo FOUR",
+def_1 : ; \@echo ONE; $sleep_command 12 ; echo TWO
+def_2 : ; \@$sleep_command 8 ; echo THREE
+def_3 : ; \@$sleep_command 4 ; echo FOUR",
'-j4', "ONE\nFOUR\nTHREE\nTWO");
# Test parallelism with included files. Here we sleep/echo while
@@ -38,8 +38,8 @@
run_make_test("
all: 1 2; \@echo success
-include 1.inc 2.inc
-1.inc: ; \@echo ONE.inc; $sleep_command 2; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 2; echo TWO' > \$\@
-2.inc: ; \@$sleep_command 1; echo THREE.inc; echo '2: ; \@$sleep_command 1; echo THREE' > \$\@",
+1.inc: ; \@echo ONE.inc; $sleep_command 8; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 8; echo TWO' > \$\@
+2.inc: ; \@$sleep_command 4; echo THREE.inc; echo '2: ; \@$sleep_command 4; echo THREE' > \$\@",
"-j4",
"ONE.inc\nTHREE.inc\nTWO.inc\nONE\nTHREE\nTWO\nsuccess\n");
@@ -57,8 +57,8 @@
-include 1.inc 2.inc
endif
-1.inc: ; \@echo ONE.inc; $sleep_command 2; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 2; echo TWO' > \$\@
-2.inc: ; \@$sleep_command 1; echo THREE.inc; echo '2: ; \@$sleep_command 1; echo THREE' > \$\@",
+1.inc: ; \@echo ONE.inc; $sleep_command 8; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 8; echo TWO' > \$\@
+2.inc: ; \@$sleep_command 4; echo THREE.inc; echo '2: ; \@$sleep_command 4; echo THREE' > \$\@",
"-j4",
"ONE.inc\nTHREE.inc\nTWO.inc\nONE\nTHREE\nTWO\nsuccess\n");
@@ -95,7 +95,7 @@
\@exit 1
ok:
- \@sleep 4
+ \@sleep 8
\@echo Ok done",
'-rR -j5', 'Fail
#MAKE#: *** [fail.1] Error 1

188
make.changes Normal file
View File

@ -0,0 +1,188 @@
-------------------------------------------------------------------
Tue Oct 31 12:48:35 CET 2006 - mhopf@suse.de
- Reducing race probability in test case features/parallelism even more.
-------------------------------------------------------------------
Wed Jun 7 12:20:28 CEST 2006 - mhopf@suse.de
- Improving occasional build failures due to races in test cases.
-------------------------------------------------------------------
Mon May 29 14:28:37 CEST 2006 - mhopf@suse.de
- Update to 3.81
- Bug fixes
- New functions: lastword, abspath, realpath, info, flavor, or, and
- New variables: .INCLUDE_DIRS, .FEATURES, .DEFAULT_GOAL, MAKE_RESTARTS, $|
- Some new features
- More POSIX compatibility
- memory-hog-2.diff doesn't apply any longer
-------------------------------------------------------------------
Wed Feb 1 20:29:39 CET 2006 - kssingvo@suse.de
- fix for memory-hog.diff (bugzilla#147229)
-------------------------------------------------------------------
Wed Feb 1 18:15:14 CET 2006 - kssingvo@suse.de
- disabled memory-hog.diff due to crashes (bugzilla#147229)
-------------------------------------------------------------------
Wed Jan 25 21:30:30 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Thu Jan 19 14:36:00 CET 2006 - aj@suse.de
- Reduce memory usage.
-------------------------------------------------------------------
Fri Jan 9 16:16:49 CET 2004 - adrian@suse.de
- do not strip binaries during install
-------------------------------------------------------------------
Tue Sep 30 18:56:18 CEST 2003 - stepan@suse.de
- fix "virtual memory exhausted" bug (backport from mainline)
-------------------------------------------------------------------
Thu Apr 24 12:20:23 CEST 2003 - ro@suse.de
- fix install_info --delete call and move from preun to postun
-------------------------------------------------------------------
Wed Apr 16 16:20:30 CEST 2003 - coolo@suse.de
- use BuildRoot
-------------------------------------------------------------------
Fri Feb 7 02:03:03 CET 2003 - ro@suse.de
- added install_info macros
-------------------------------------------------------------------
Mon Dec 30 16:57:22 CET 2002 - aj@suse.de
- Update to version 3.80:
- number of bug fixes
- new features as mentioned in the NEWS file:
* New functions $(value ...), $(eval ...)
* New feature: order-only prerequesites.
* Argument to ifdef can now be a variable.
* new option --always-make
-------------------------------------------------------------------
Tue Sep 17 18:43:14 CEST 2002 - ro@suse.de
- removed bogus self-provides
-------------------------------------------------------------------
Thu May 23 15:39:17 CEST 2002 - meissner@suse.de
- Made %_lib fix generic, do not use ifarch.
-------------------------------------------------------------------
Mon Apr 22 14:43:25 CEST 2002 - meissner@suse.de
- x86_64 needs /*/lib64 as search path too.
-------------------------------------------------------------------
Fri Apr 19 14:55:23 CEST 2002 - ke@suse.de
- Update German translation from
http://www.iro.umontreal.ca/contrib/po/teams/PO/de/ [# 15851].
-------------------------------------------------------------------
Tue Dec 11 17:19:45 CET 2001 - froh@suse.de
- s390x, sparc64 and ia64: extended the 'Dynamic Library Search'
default path to search /lib64 and /usr/lib64 as well.
-------------------------------------------------------------------
Wed Nov 28 18:11:47 CET 2001 - fehr@suse.de
- add mo-files for translations of messages
-------------------------------------------------------------------
Wed May 9 19:32:33 CEST 2001 - cstein@suse.de
- repacked source files with bzip2
-------------------------------------------------------------------
Fri Nov 17 12:17:07 MET 2000 - fehr@suse.de
- set group tag
-------------------------------------------------------------------
Mon Jun 26 11:02:59 MEST 2000 - fehr@suse.de
- change to new version 3.79.1
-------------------------------------------------------------------
Wed Apr 19 12:09:54 MEST 2000 - fehr@suse.de
- change to new version 3.79
-------------------------------------------------------------------
Mon Feb 14 15:26:39 CET 2000 - fehr@suse.de
- add compatibility link gmake -> make, needed for oracle install
-------------------------------------------------------------------
Thu Jan 20 16:48:47 MET 2000 - fehr@suse.de
- security fix for files created in /tmp when using -j
-------------------------------------------------------------------
Mon Jan 17 13:13:45 CET 2000 - schwab@suse.de
- Update to 3.78.1.
- Get rid of Makefile.Linux.
- Run testsuite.
-------------------------------------------------------------------
Fri Jan 14 12:29:15 CET 2000 - schwab@suse.de
- Fix glob problem.
-------------------------------------------------------------------
Wed Oct 13 18:27:49 CEST 1999 - schwab@suse.de
- Fix file list.
- Add autoconf to needforbuild
-------------------------------------------------------------------
Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
-------------------------------------------------------------------
Tue Feb 23 14:59:10 MET 1999 - ro@suse.de
- updated to 3.77 using fixes by c. gafton
-------------------------------------------------------------------
Wed Sep 23 18:27:57 MEST 1998 - ro@suse.de
- downgrade to 3.76.1 (works at least)
-------------------------------------------------------------------
Tue Sep 22 17:10:22 MEST 1998 - ro@suse.de
- update to 3.77
----------------------------------------------------------------------------
Thu Oct 9 19:08:47 MEST 1997 - florian@suse.de
- prepare for autobuild
-------------------------------------------------------------------------
Mon Sep 2 02:48:35 MET DST 1996
update to version 3.75

158
make.spec Normal file
View File

@ -0,0 +1,158 @@
#
# spec file for package make (Version 3.81)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: make
URL: http://www.gnu.org/software/make/make.html
License: GNU General Public License (GPL) - all versions
Group: Development/Tools/Building
Provides: gmake
PreReq: %install_info_prereq
Autoreqprov: on
Version: 3.81
Release: 16
Summary: GNU make
Source: make-3.81.tar.bz2
Patch1: make-memory-hog-2.diff
Patch2: make-slowdown-parallelism.diff
Patch64: make-library-search-path.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
The GNU make command with extensive documentation.
Authors:
--------
Richard Stallman
Roland McGrath
Paul Smith
%prep
%setup
#%patch1 -p1
%patch2
if [ %_lib == lib64 ]; then
%patch64
fi
%build
CFLAGS=$RPM_OPT_FLAGS \
./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
make
make check
%install
make DESTDIR=$RPM_BUILD_ROOT install
ln -s make $RPM_BUILD_ROOT/usr/bin/gmake
%files
%defattr(-,root,root)
/usr/bin/make
/usr/bin/gmake
/usr/share/locale/*/*/make.mo
%doc /usr/share/info/make.info-*.gz
%doc /usr/share/info/make.info.gz
%doc /usr/share/man/man1/make.1.gz
%post
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%postun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%changelog -n make
* Tue Oct 31 2006 - mhopf@suse.de
- Reducing race probability in test case features/parallelism even more.
* Wed Jun 07 2006 - mhopf@suse.de
- Improving occasional build failures due to races in test cases.
* Mon May 29 2006 - mhopf@suse.de
- Update to 3.81
- Bug fixes
- New functions: lastword, abspath, realpath, info, flavor, or, and
- New variables: .INCLUDE_DIRS, .FEATURES, .DEFAULT_GOAL, MAKE_RESTARTS, $|
- Some new features
- More POSIX compatibility
- memory-hog-2.diff doesn't apply any longer
* Wed Feb 01 2006 - kssingvo@suse.de
- fix for memory-hog.diff (bugzilla#147229)
* Wed Feb 01 2006 - kssingvo@suse.de
- disabled memory-hog.diff due to crashes (bugzilla#147229)
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Jan 19 2006 - aj@suse.de
- Reduce memory usage.
* Fri Jan 09 2004 - adrian@suse.de
- do not strip binaries during install
* Tue Sep 30 2003 - stepan@suse.de
- fix "virtual memory exhausted" bug (backport from mainline)
* Thu Apr 24 2003 - ro@suse.de
- fix install_info --delete call and move from preun to postun
* Wed Apr 16 2003 - coolo@suse.de
- use BuildRoot
* Fri Feb 07 2003 - ro@suse.de
- added install_info macros
* Mon Dec 30 2002 - aj@suse.de
- Update to version 3.80:
- number of bug fixes
- new features as mentioned in the NEWS file:
* New functions $(value ...), $(eval ...)
* New feature: order-only prerequesites.
* Argument to ifdef can now be a variable.
* new option --always-make
* Tue Sep 17 2002 - ro@suse.de
- removed bogus self-provides
* Thu May 23 2002 - meissner@suse.de
- Made %%_lib fix generic, do not use ifarch.
* Mon Apr 22 2002 - meissner@suse.de
- x86_64 needs /*/lib64 as search path too.
* Fri Apr 19 2002 - ke@suse.de
- Update German translation from
http://www.iro.umontreal.ca/contrib/po/teams/PO/de/ [# 15851].
* Tue Dec 11 2001 - froh@suse.de
- s390x, sparc64 and ia64: extended the 'Dynamic Library Search'
default path to search /lib64 and /usr/lib64 as well.
* Wed Nov 28 2001 - fehr@suse.de
- add mo-files for translations of messages
* Wed May 09 2001 - cstein@suse.de
- repacked source files with bzip2
* Fri Nov 17 2000 - fehr@suse.de
- set group tag
* Mon Jun 26 2000 - fehr@suse.de
- change to new version 3.79.1
* Wed Apr 19 2000 - fehr@suse.de
- change to new version 3.79
* Mon Feb 14 2000 - fehr@suse.de
- add compatibility link gmake -> make, needed for oracle install
* Thu Jan 20 2000 - fehr@suse.de
- security fix for files created in /tmp when using -j
* Mon Jan 17 2000 - schwab@suse.de
- Update to 3.78.1.
- Get rid of Makefile.Linux.
- Run testsuite.
* Fri Jan 14 2000 - schwab@suse.de
- Fix glob problem.
* Wed Oct 13 1999 - schwab@suse.de
- Fix file list.
- Add autoconf to needforbuild
* Mon Sep 13 1999 - bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
* Tue Feb 23 1999 - ro@suse.de
- updated to 3.77 using fixes by c. gafton
* Wed Sep 23 1998 - ro@suse.de
- downgrade to 3.76.1 (works at least)
* Tue Sep 22 1998 - ro@suse.de
- update to 3.77
* Thu Oct 09 1997 - florian@suse.de
- prepare for autobuild
Mon Sep 2 02:48:35 MET DST 1996
update to version 3.75

0
ready Normal file
View File