public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/smlnj/files/
@ 2023-01-26 10:33 Alfredo Tupone
  0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2023-01-26 10:33 UTC (permalink / raw
  To: gentoo-commits

commit:     8130183f4b5e9f104290f487108dc272c53e07cd
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 10:31:31 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 10:31:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8130183f

dev-lang/smlnj: better makefile fix

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-lang/smlnj/files/smlnj-110.99.3-shuffle.patch | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev-lang/smlnj/files/smlnj-110.99.3-shuffle.patch b/dev-lang/smlnj/files/smlnj-110.99.3-shuffle.patch
index c16fece127be..8073e36baf41 100644
--- a/dev-lang/smlnj/files/smlnj-110.99.3-shuffle.patch
+++ b/dev-lang/smlnj/files/smlnj-110.99.3-shuffle.patch
@@ -1,12 +1,10 @@
 --- a/base/runtime/c-libs/smlnj-date/makefile	2023-01-23 08:32:22.450319630 +0100
 +++ b/base/runtime/c-libs/smlnj-date/makefile	2023-01-23 08:37:23.920174357 +0100
-@@ -26,7 +26,8 @@
+@@ -26,6 +26,7 @@
  		strftime.o \
  		unix-date.o
  
--$(LIBRARY)	: $(VERSION) $(OBJS)
-+$(LIBRARY) : $(VERSION)
-+	$(MAKE) $(OBJS)
++$(OBJS) : $(VERSION)
+ $(LIBRARY)	: $(VERSION) $(OBJS)
  	rm -rf $(LIBRARY)
  	$(AR) $(ARFLAGS) $(LIBRARY) $(OBJS)
- 	$(RANLIB) $(LIBRARY)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/smlnj/files/
@ 2024-05-30 14:55 Arthur Zamarin
  0 siblings, 0 replies; 4+ messages in thread
From: Arthur Zamarin @ 2024-05-30 14:55 UTC (permalink / raw
  To: gentoo-commits

commit:     83247d1b8c7294fe88e1612661548ead1aff5467
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue May 28 16:27:18 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu May 30 14:54:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83247d1b

dev-lang/smlnj: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-lang/smlnj/files/smlnj-110.99.3-shuffle.patch | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/dev-lang/smlnj/files/smlnj-110.99.3-shuffle.patch b/dev-lang/smlnj/files/smlnj-110.99.3-shuffle.patch
deleted file mode 100644
index 8073e36baf41..000000000000
--- a/dev-lang/smlnj/files/smlnj-110.99.3-shuffle.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/base/runtime/c-libs/smlnj-date/makefile	2023-01-23 08:32:22.450319630 +0100
-+++ b/base/runtime/c-libs/smlnj-date/makefile	2023-01-23 08:37:23.920174357 +0100
-@@ -26,6 +26,7 @@
- 		strftime.o \
- 		unix-date.o
- 
-+$(OBJS) : $(VERSION)
- $(LIBRARY)	: $(VERSION) $(OBJS)
- 	rm -rf $(LIBRARY)
- 	$(AR) $(ARFLAGS) $(LIBRARY) $(OBJS)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/smlnj/files/
@ 2024-06-04  7:29 Alfredo Tupone
  0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2024-06-04  7:29 UTC (permalink / raw
  To: gentoo-commits

commit:     071551d00babe36eae561834f39ec3d23d1f9680
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 07:29:11 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 07:29:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071551d0

dev-lang/smlnj: fix makefile

Closes: https://bugs.gentoo.org/911877
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-lang/smlnj/files/smlnj-110.99.4-shuffle.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dev-lang/smlnj/files/smlnj-110.99.4-shuffle.patch b/dev-lang/smlnj/files/smlnj-110.99.4-shuffle.patch
index 603eeed0f562..0f0d343fc136 100644
--- a/dev-lang/smlnj/files/smlnj-110.99.4-shuffle.patch
+++ b/dev-lang/smlnj/files/smlnj-110.99.4-shuffle.patch
@@ -11,3 +11,15 @@
  	rm -rf $(LIBRARY)
  	$(AR) $(ARFLAGS) $(LIBRARY) $(OBJS)
  	$(RANLIB) $(LIBRARY)
+--- a/base/runtime/objs/makefile	2024-06-04 09:26:03.961409055 +0200
++++ b/base/runtime/objs/makefile	2024-06-04 09:27:12.461586788 +0200
+@@ -113,7 +113,8 @@
+ 	(cd $(MP_DIR); $(MAKE) MAKE="$(MAKE)" clean)
+ 
+ 
+-$(RUNTIME):	$(VERSION) main.o $(OBJS) $(ALL_LIBS)
++$(RUNTIME): $(VERSION)
++	$(MAKE) main.o $(OBJS) $(ALL_LIBS)
+ 	$(CC) -o $(RUNTIME) $(CFLAGS) $(LDFLAGS) main.o $(OBJS) $(ALL_LIBS) $(LD_LIBS)
+ 
+ $(RUNTIME_A):	$(VERSION) main.o $(OBJS) $(ALL_LIBS)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/smlnj/files/
@ 2024-06-04  7:36 Alfredo Tupone
  0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2024-06-04  7:36 UTC (permalink / raw
  To: gentoo-commits

commit:     0f0b91303f6a45dda7723444888eb502008f8a0c
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 07:35:34 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 07:35:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f0b9130

dev-lang/smlnj: fix make

Closes: https://bugs.gentoo.org/911785
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-lang/smlnj/files/smlnj-110.99.4-shuffle.patch | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/dev-lang/smlnj/files/smlnj-110.99.4-shuffle.patch b/dev-lang/smlnj/files/smlnj-110.99.4-shuffle.patch
index 0f0d343fc136..9a37a1d859bb 100644
--- a/dev-lang/smlnj/files/smlnj-110.99.4-shuffle.patch
+++ b/dev-lang/smlnj/files/smlnj-110.99.4-shuffle.patch
@@ -1,12 +1,11 @@
 --- a/base/runtime/c-libs/posix-io/makefile	2024-06-04 08:38:20.192453601 +0200
 +++ b/base/runtime/c-libs/posix-io/makefile	2024-06-04 08:39:09.504903619 +0200
-@@ -37,7 +37,9 @@
+@@ -37,7 +37,8 @@
          lseek.o \
          fsync.o
  
 -$(LIBRARY)	: $(VERSION) $(OBJS)
-+$(LIBRARY)	:
-+	$(MAKE) $(VERSION)
++$(LIBRARY)	: $(VERSION)
 +	$(MAKE) $(OBJS)
  	rm -rf $(LIBRARY)
  	$(AR) $(ARFLAGS) $(LIBRARY) $(OBJS)
@@ -23,3 +22,15 @@
  	$(CC) -o $(RUNTIME) $(CFLAGS) $(LDFLAGS) main.o $(OBJS) $(ALL_LIBS) $(LD_LIBS)
  
  $(RUNTIME_A):	$(VERSION) main.o $(OBJS) $(ALL_LIBS)
+--- a/base/runtime/c-libs/posix-signal/makefile	2024-06-04 09:32:49.906560537 +0200
++++ b/base/runtime/c-libs/posix-signal/makefile	2024-06-04 09:33:12.811305204 +0200
+@@ -21,7 +21,8 @@
+ OBJS =	posix-signal-lib.o \
+ 	osval.o
+ 
+-$(LIBRARY)	: $(VERSION) $(OBJS)
++$(LIBRARY)	: $(VERSION)
++	$(MAKE) $(OBJS)
+ 	rm -rf $(LIBRARY)
+ 	$(AR) $(ARFLAGS) $(LIBRARY) $(OBJS)
+ 	$(RANLIB) $(LIBRARY)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-06-04  7:36 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-30 14:55 [gentoo-commits] repo/gentoo:master commit in: dev-lang/smlnj/files/ Arthur Zamarin
  -- strict thread matches above, loose matches on Subject: below --
2024-06-04  7:36 Alfredo Tupone
2024-06-04  7:29 Alfredo Tupone
2023-01-26 10:33 Alfredo Tupone

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox