Skip to content

Commit

Permalink
add parrot to build system
Browse files Browse the repository at this point in the history
  • Loading branch information
jblomer committed Jul 14, 2015
1 parent a81dc8f commit fb66b88
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ DROPBEAR_UPSTREAM_VERSION = 2015.67
DROPBEAR_RELEASE = 1
PATCHELF_UPSTREAM_VERSION = 0.8
PATCHELF_RELEASE = 1
PARROT_UPSTREAM_VERSION = 5.0.0-alpha
PARROT_UPSTREAM_VERSION = 5.0.1
PARROT_RELEASE = 1
NTPCLIENT_UPSTREAM_VERSION = 2010
NTPCLIENT_RELEASE = 1
Expand Down
1 change: 1 addition & 0 deletions packages.d/config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ PACKAGES = \
e2fsprogs \
kexec \
ntpclient \
parrot \
patchelf \
sfdisk \
cvmfs \
Expand Down
12 changes: 2 additions & 10 deletions packages.d/parrot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,12 @@ $(PARROT_BUILDPRODUCT): $(PARROT_MAKEFILE) $(PARROT_SOURCETREE)/Makefile

$(PARROT_MAKEFILE): $(PARROT_CONFIGURE_PATCHED) $(LIBCVMFS_INCLUDE) $(LIBCVMFS_ARCHIVE)
cd $(PARROT_SOURCETREE) && ./configure \
--debug \
--with-cvmfs-path $$(pwd)/../$(LIBCVMFS_SOURCETREE)/pickup \
--without-system-sand \
--without-system-allpairs \
--without-system-wavefront \
--without-system-makeflow \
--without-system-resource_monitor \
--without-system-doc
git checkout Makefile
--with-cvmfs-path $$(pwd)/../$(LIBCVMFS_SOURCETREE)/pickup

$(PARROT_CONFIGURE_PATCHED): $(PARROT_CONFIGURE) $(PARROT_CHECKOUT_SENTINEL)
cat $(PARROT_CONFIGURE) | sed -e 's/config_mysql_path=auto/config_mysql_path=no/' > $(PARROT_CONFIGURE_PATCHED)
chmod +x $(PARROT_CONFIGURE_PATCHED)
cp $(PARROT_CONFIGURE_PATCHED) $(PARROT_CONFIGURE_PATCHED)
cp $(PARROT_CONFIGURE_PATCHED) $(PARROT_CONFIGURE)

$(PARROT_CONFIGURE): | $(PARROT_SOURCETREE)

Expand Down
2 changes: 1 addition & 1 deletion packages.d/parrot/config.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PARROT_GIT = https://github.com/cooperative-computing-lab/cctools.git
PARROT_TREEISH = 15eeedd
PARROT_TREEISH = 36cc9c0d0c35
PARROT_SOURCETREE = parrot-$(PARROT_TREEISH)

LIBCVMFS_GIT = https://github.com/cvmfs/cvmfs.git
Expand Down

0 comments on commit fb66b88

Please sign in to comment.