* [gentoo-commits] repo/gentoo:master commit in: dev-lang/moarvm/files/
@ 2016-05-09 7:09 Amy Winston
0 siblings, 0 replies; 4+ messages in thread
From: Amy Winston @ 2016-05-09 7:09 UTC (permalink / raw
To: gentoo-commits
commit: c7488f5e5c8a664d811ec86e2328f2147f0eda72
Author: Marshall Brewer (Gentoo Key) <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Sun May 8 20:43:34 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Mon May 9 07:06:23 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7488f5e
dev-lang/moarvm: remove unneeded patches
dev-lang/moarvm/files/Configure-9999.patch | 15 ---------------
dev-lang/moarvm/files/Configure.patch | 14 --------------
2 files changed, 29 deletions(-)
diff --git a/dev-lang/moarvm/files/Configure-9999.patch b/dev-lang/moarvm/files/Configure-9999.patch
deleted file mode 100644
index 85bbb5d..0000000
--- a/dev-lang/moarvm/files/Configure-9999.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Configure.pl 2014-01-09 16:48:13.989620752 +0800
-+++ Configure.pl.new 2014-01-09 16:49:41.217885279 +0800
-@@ -94,11 +94,7 @@
- $VERSION = <$fh>;
- close($fh);
- }
--# .git is a file and not a directory in submodule
--if (-e '.git' && open(my $GIT, '-|', "git describe --tags")) {
-- $VERSION = <$GIT>;
-- close($GIT);
--}
-+
- chomp $VERSION;
- $config{version} = $VERSION;
- $config{versionmajor} = $VERSION =~ /^(\d+)/ ? $1 : 0;
diff --git a/dev-lang/moarvm/files/Configure.patch b/dev-lang/moarvm/files/Configure.patch
deleted file mode 100644
index 42c6fb9..0000000
--- a/dev-lang/moarvm/files/Configure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Configure.pl 2013-12-06 10:13:34.000000000 +0800
-+++ Configure.pl.new 2013-12-06 10:22:28.360040309 +0800
-@@ -38,11 +38,6 @@
-
- print "Welcome to MoarVM!\n\n";
-
--print dots("Updating submodules");
--my $msg = qx{git submodule --quiet update --init 2>&1};
--if ($? >> 8 == 0) { print "OK\n" }
--else { softfail("git error: $msg") }
--
- # fiddle with flags
- $args{debug} //= 0 + !$args{optimize};
- $args{optimize} //= 0 + !$args{debug};
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/moarvm/files/
@ 2017-08-08 15:58 Kent Fredric
0 siblings, 0 replies; 4+ messages in thread
From: Kent Fredric @ 2017-08-08 15:58 UTC (permalink / raw
To: gentoo-commits
commit: 7c15e51cdc58f8eebb068f1afb71a9721f16a73b
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Aug 7 15:52:15 2017 +0000
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Tue Aug 8 15:57:57 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c15e51c
dev-lang/moarvm: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/5337
dev-lang/moarvm/files/Configure-2016.04.patch | 145 --------------------------
1 file changed, 145 deletions(-)
diff --git a/dev-lang/moarvm/files/Configure-2016.04.patch b/dev-lang/moarvm/files/Configure-2016.04.patch
deleted file mode 100644
index 6fd46c2a285..00000000000
--- a/dev-lang/moarvm/files/Configure-2016.04.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff --git a/Configure.pl b/Configure.pl
-index 72a5dad..f829d5c 100755
---- a/Configure.pl
-+++ b/Configure.pl
-@@ -32,7 +32,7 @@ GetOptions(\%args, qw(
- os=s shell=s toolchain=s compiler=s
- ar=s cc=s ld=s make=s has-sha has-libuv
- static has-libtommath has-libatomic_ops
-- has-dyncall has-libffi
-+ has-dyncall has-libffi pkgconfig=s
- build=s host=s big-endian jit! enable-jit lua=s has-dynasm
- prefix=s bindir=s libdir=s mastdir=s make-install asan ubsan),
- 'no-optimize|nooptimize' => sub { $args{optimize} = 0 },
-@@ -99,6 +99,7 @@ $config{config} = join ' ', map { / / ? "\"$_\"" : $_ } @args;
- $config{osname} = $^O;
- $config{osvers} = $Config{osvers};
- $config{lua} = $args{lua} // './3rdparty/dynasm/minilua@exe@';
-+$config{pkgconfig} = $args{pkgconfig} // '/usr/bin/pkg-config';
-
- # set options that take priority over all others
- my @keys = qw( ar cc ld make );
-@@ -164,12 +165,33 @@ if (-e '3rdparty/libuv/src/unix/threadpool' . $defaults{obj}
- system($defaults{make}, 'realclean')
- }
-
-+# test whether pkg-config works
-+if (-e "$config{pkgconfig}") {
-+ print("\nTesting pkgconfig ... ");
-+ system("$config{pkgconfig}", "--version");
-+ if ( $? == 0 ) {
-+ $config{pkgconfig_works} = 1;
-+ } else {
-+ $config{pkgconfig_works} = 0;
-+ }
-+}
-+
- # conditionally set include dirs and install rules
- $config{cincludes} //= '';
- $config{install} //= '';
- if ($args{'has-libuv'}) {
- $defaults{-thirdparty}->{uv} = undef;
- unshift @{$config{usrlibs}}, 'uv';
-+ if ($config{pkgconfig_works}) {
-+ my $result = `$config{pkgconfig} --cflags libuv`;
-+ if ( $? == 0 ) {
-+ $result =~ s/\n/ /g;
-+ $config{cincludes} .= ' ' . "$result";
-+ print("Adding extra include for libuv: $result\n");
-+ } else {
-+ print("Error occured when running $config{pkgconfig} --cflags libuv.\n");
-+ }
-+ }
- }
- else {
- $config{cincludes} .= ' ' . $defaults{ccinc} . '3rdparty/libuv/include'
-@@ -181,6 +203,16 @@ else {
- if ($args{'has-libatomic_ops'}) {
- $defaults{-thirdparty}->{lao} = undef;
- unshift @{$config{usrlibs}}, 'atomic_ops';
-+ if ($config{pkgconfig_works}) {
-+ my $result = `$config{pkgconfig} --cflags atomic_ops`;
-+ if ( $? == 0 ) {
-+ $result =~ s/\n/ /g;
-+ $config{cincludes} .= ' ' . "$result";
-+ print("Adding extra include for atomic_ops: $result\n");
-+ } else {
-+ print("Error occured when running $config{pkgconfig} --cflags atomic_ops.\n");
-+ }
-+ }
- }
- else {
- $config{cincludes} .= ' ' . $defaults{ccinc} . '3rdparty/libatomic_ops/src';
-@@ -216,7 +248,8 @@ if ($args{'has-libtommath'}) {
- }
- else {
- $config{cincludes} .= ' ' . $defaults{ccinc} . '3rdparty/libtommath';
-- $config{install} .= "\t\$(CP) 3rdparty/libtommath/*.h \$(DESTDIR)\$(PREFIX)/include/libtommath\n";
-+ $config{install} .= "\t\$(MKPATH) \$(DESTDIR)\$(PREFIX)/include/libtommath\n"
-+ . "\t\$(CP) 3rdparty/libtommath/*.h \$(DESTDIR)\$(PREFIX)/include/libtommath\n";
- }
-
- if ($args{'has-dynasm'}) {
-@@ -232,6 +265,16 @@ if ($args{'has-libffi'}) {
- $config{nativecall_backend} = 'libffi';
- unshift @{$config{usrlibs}}, 'ffi';
- push @{$config{defs}}, 'HAVE_LIBFFI';
-+ if ($config{pkgconfig_works}) {
-+ my $result = `$config{pkgconfig} --cflags libffi`;
-+ if ( $? == 0 ) {
-+ $result =~ s/\n/ /g;
-+ $config{cincludes} .= ' ' . "$result";
-+ print("Adding extra include for libffi: $result\n");
-+ } else {
-+ print("Error occured when running $config{pkgconfig} --cflags libffi.\n");
-+ }
-+ }
- }
- elsif ($args{'has-dyncall'}) {
- unshift @{$config{usrlibs}}, 'dyncall_s', 'dyncallback_s', 'dynload_s';
-@@ -364,6 +407,7 @@ my $order = $config{be} ? 'big endian' : 'little endian';
- print "\n", <<TERM, "\n";
- make: $config{make}
- compile: $config{cc} $config{cflags}
-+ includes: $config{cincludes}
- link: $config{ld} $config{ldflags}
- libs: $config{ldlibs}
-
-@@ -873,6 +917,10 @@ Build and install MoarVM in addition to configuring it.
-
- =item --has-libffi
-
-+=item --pkgconfig=/path/to/pkgconfig/executable
-+
-+Provide path to the pkgconfig executable. Default: /usr/bin/pkg-config
-+
- =item --no-jit
-
- Disable JIT compiler, which is enabled by default to JIT-compile hot frames.
-diff --git a/build/Makefile.in b/build/Makefile.in
-index 56a4c8a..b94e847 100644
---- a/build/Makefile.in
-+++ b/build/Makefile.in
-@@ -454,9 +454,6 @@ install: all
- $(CP) src/strings/*.h $(DESTDIR)$(PREFIX)/include/moar/strings
- $(CP) src/jit/*.h $(DESTDIR)$(PREFIX)/include/moar/jit
- $(CP) src/instrument/*.h $(DESTDIR)$(PREFIX)/include/moar/instrument
-- $(MKPATH) $(DESTDIR)$(PREFIX)/include/libuv
-- $(MKPATH) $(DESTDIR)$(PREFIX)/include/libtommath
-- $(CP) 3rdparty/libuv/include/*.h $(DESTDIR)$(PREFIX)/include/libuv
- @install@
-
- lib: @moar@
-diff --git a/build/setup.pm b/build/setup.pm
-index 324cc88..c87d79e 100755
---- a/build/setup.pm
-+++ b/build/setup.pm
-@@ -125,7 +125,7 @@ our %TC_POSIX = (
- ccshared => '-fPIC',
- ldshared => '-shared @ccshared@',
- moarshared => '',
-- ldrpath => '-Wl,-rpath,@libdir@ -Wl,-rpath,@prefix@/share/perl6/site/lib',
-+ ldrpath => '-Wl,-rpath,/@libdir@ -Wl,-rpath,@prefix@/share/perl6/site/lib',
-
- arflags => 'rcs',
- arout => '',
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/moarvm/files/
@ 2020-09-12 21:10 Kent Fredric
0 siblings, 0 replies; 4+ messages in thread
From: Kent Fredric @ 2020-09-12 21:10 UTC (permalink / raw
To: gentoo-commits
commit: 37c280502d46fc52827866f06ec59c71391dfc98
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Sep 5 17:04:14 2020 +0000
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Sat Sep 12 21:09:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37c28050
dev-lang/moarvm: remove unused patch(es)
Closes: https://github.com/gentoo/gentoo/pull/17428
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Kent Fredric <kentnl <AT> gentoo.org>
dev-lang/moarvm/files/fix-quoting.patch | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/dev-lang/moarvm/files/fix-quoting.patch b/dev-lang/moarvm/files/fix-quoting.patch
deleted file mode 100644
index f3e02b156ab..00000000000
--- a/dev-lang/moarvm/files/fix-quoting.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f1b26bb0e8f4e0a00ac31f9defb1ed74b820eb39 Mon Sep 17 00:00:00 2001
-From: Stefan Seifert <nine@detonation.org>
-Date: Mon, 15 Jul 2019 12:04:45 +0200
-Subject: [PATCH] Fix Configure.pl failing when --prefix /usr is passed
-
-gerd++ reported this on Github 1143 and supplied the diagnostics and
-fix:
-If the prefix is exact /usr, then it seems that in build/Makefile.in
-@moardll@: $(OBJECTS) $(THIRDPARTY)
- $(MSG) linking $@
- $(CMD)$(LD) @ldout@$@ $(LDFLAGS) @ldshared@ @moarshared@ $(OBJECTS) $(DLL_LIBS)
-moarshared will not be substituted or is wrong.
----
- Configure.pl | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Configure.pl b/Configure.pl
-index b71b576be..753dcfaac 100755
---- a/Configure.pl
-+++ b/Configure.pl
-@@ -441,6 +441,7 @@ sub uniq {
- push @ldflags, $ENV{LDFLAGS} if $ENV{LDFLAGS};
- $config{ldflags} = join ' ', @ldflags;
-
-+$config{moarshared} = '';
- # Switch shared lib compiler flags in relocatable case.
- if (not $args{static} and $config{prefix} ne '/usr') {
- $config{moarshared} = $config{moarshared_relocatable} if $args{relocatable};
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/moarvm/files/
@ 2024-03-18 20:00 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2024-03-18 20:00 UTC (permalink / raw
To: gentoo-commits
commit: f7647c1638ac2ecbb7a2ca48a6755cfb53b33549
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Mar 17 12:21:20 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 20:00:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7647c16
dev-lang/moarvm: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/moarvm-2023.02-fix-build-clang16.patch | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/dev-lang/moarvm/files/moarvm-2023.02-fix-build-clang16.patch b/dev-lang/moarvm/files/moarvm-2023.02-fix-build-clang16.patch
deleted file mode 100644
index 9f8a60672ee2..000000000000
--- a/dev-lang/moarvm/files/moarvm-2023.02-fix-build-clang16.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Bug: https://bugs.gentoo.org/881335
-Upstream PR: https://github.com/MoarVM/MoarVM/pull/1764
---- a/src/6model/containers.c
-+++ b/src/6model/containers.c
-@@ -114,7 +114,7 @@ static const MVMContainerSpec code_pair_spec = {
- code_pair_fetch_s,
- code_pair_store,
- code_pair_store_i,
-- code_pair_store_i, /* FIXME need a code_pair_store_u but lacking tests showing this need */
-+ (void *)code_pair_store_i, /* FIXME need a code_pair_store_u but lacking tests showing this need */
- code_pair_store_n,
- code_pair_store_s,
- code_pair_store,
-@@ -371,7 +371,7 @@ static const MVMContainerSpec value_desc_cont_spec = {
- value_desc_cont_fetch_s,
- value_desc_cont_store,
- value_desc_cont_store_i,
-- value_desc_cont_store_i, /* FIXME need a value_desc_cont_store_u but lacking tests showing this need */
-+ (void *)value_desc_cont_store_i, /* FIXME need a value_desc_cont_store_u but lacking tests showing this need */
- value_desc_cont_store_n,
- value_desc_cont_store_s,
- value_desc_cont_store_unchecked,
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-18 20:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-18 20:00 [gentoo-commits] repo/gentoo:master commit in: dev-lang/moarvm/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2020-09-12 21:10 Kent Fredric
2017-08-08 15:58 Kent Fredric
2016-05-09 7:09 Amy Winston
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox