Skip to content

Commit 9888d90

Browse files
committed
[GR-45043] Adopt YARP's latest changes
PullRequest: truffleruby/3941
2 parents 65b4c2f + 5186351 commit 9888d90

File tree

22 files changed

+1029
-5336
lines changed

22 files changed

+1029
-5336
lines changed

mx.truffleruby/mx_truffleruby.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -131,20 +131,6 @@ def __init__(self, suite, name, deps, workingSets, output=None, **kwArgs):
131131
results=kwArgs.pop('results'),
132132
output=path, d=path, vpath=False, **kwArgs)
133133

134-
def getBuildTask(self, args):
135-
return YARPNativeBuildTask(args, self)
136-
137-
class YARPNativeBuildTask(mx.NativeBuildTask):
138-
def build(self):
139-
mx.run(['./configure'], cwd=self.subject.dir)
140-
super(YARPNativeBuildTask, self).build() # make
141-
142-
def clean(self, forBuild=False):
143-
if exists(join(self.subject.dir, 'Makefile')):
144-
super(YARPNativeBuildTask, self).clean(forBuild=forBuild)
145-
else:
146-
pass
147-
148134
# Commands
149135

150136
def jt(*args):

src/main/c/yarp/.gitignore

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
/doc/
77
/pkg/
88
/spec/reports/
9+
/test/serialized/
910
/top-100-gems/
1011
/tmp/
1112
/vendor/bundle
@@ -28,7 +29,6 @@ a.out
2829
/java/org/yarp/AbstractNodeVisitor.java
2930
/java/org/yarp/Loader.java
3031
/java/org/yarp/Nodes.java
31-
/java/org/yarp/ParseResult.java
3232
/lib/yarp/node.rb
3333
/lib/yarp/serialize.rb
3434
/src/node.c
@@ -40,12 +40,4 @@ a.out
4040
compile_commands.json
4141
.cache/
4242

43-
autom4te.cache
44-
configure
45-
config.log
46-
config.status
47-
Makefile
48-
/include/yarp/config.h
49-
/config.h.in
50-
5143
tags

src/main/c/yarp/Makefile.in renamed to src/main/c/yarp/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ FUZZ_OUTPUT_DIR = $(shell pwd)/fuzz/output
1010

1111
SOEXT := $(shell ruby -e 'puts RbConfig::CONFIG["SOEXT"]')
1212

13-
DEFS := @DEFS@
14-
CPPFLAGS := @DEFS@ -Iinclude
15-
CFLAGS := @CFLAGS@ -std=c99 -Wall -Werror -Wextra -Wpedantic -Wundef -Wconversion -fPIC -fvisibility=hidden
16-
CC := @CC@
13+
CPPFLAGS := -Iinclude
14+
CFLAGS := -g -O2 -std=c99 -Wall -Werror -Wextra -Wpedantic -Wundef -Wconversion -fPIC -fvisibility=hidden
15+
CC := cc
1716

1817
HEADERS := $(shell find include -name '*.h')
1918
SOURCES := $(shell find src -name '*.c')

src/main/c/yarp/config.h.in

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)