Skip to content

Commit 5dabddf

Browse files
committed
Import generated configure and Makefile from YARP to avoid dependency on autoconf
1 parent fa05233 commit 5dabddf

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

mx.truffleruby/mx_truffleruby.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@ def getBuildTask(self, args):
135135

136136
class YARPNativeBuildTask(mx.NativeBuildTask):
137137
def build(self):
138-
mx.run(['autoconf'], cwd=self.subject.dir)
139-
mx.run(['autoheader'], cwd=self.subject.dir)
140138
mx.run(['./configure'], cwd=self.subject.dir)
141139
super(YARPNativeBuildTask, self).build() # make
142140

tool/import-yarp.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ pushd $YARP
1010
bundle
1111
bundle exec rake clobber
1212
bundle exec rake templates
13+
bundle exec rake configure
1314
popd
1415

1516
rm -rf src/main/c/yarp
1617
mkdir src/main/c/yarp
1718
cp -R $YARP/{include,src} src/main/c/yarp
18-
cp $YARP/{.gitignore,LICENSE.md,configure.ac,Makefile.in} src/main/c/yarp
19+
cp $YARP/{.gitignore,LICENSE.md,configure,config.h.in,Makefile.in} src/main/c/yarp
1920

2021
rm -rf src/yarp/java
2122
cp -R $YARP/java src/yarp/java

0 commit comments

Comments
 (0)