Skip to content

Commit

Permalink
Add support for cmake, add libgit2 pkg, update git
Browse files Browse the repository at this point in the history
  • Loading branch information
radare committed Nov 26, 2012
1 parent 131967d commit 46a2219
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 17 deletions.
11 changes: 11 additions & 0 deletions patches/gettext-018
@@ -0,0 +1,11 @@
--- gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h.orig 2012-11-21 16:38:13.000000000 +0100
+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h 2012-11-21 16:38:41.000000000 +0100
@@ -140,8 +140,6 @@
/* It is very rare that the developer ever has full control of stdin,
so any use of gets warrants an unconditional warning. Assume it is
always declared, since it is required by C89. */
-#undef gets
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");

#if @GNULIB_FOPEN@
# if @REPLACE_FOPEN@
1 change: 1 addition & 0 deletions pkg/gettext-0.18.1.1
@@ -1,3 +1,4 @@
URL=http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz
DESC="GNU Gettext"
CFGARGS="--disable-java"
PATCHES=gettext-018
3 changes: 0 additions & 3 deletions pkg/git-1.7.7.5

This file was deleted.

3 changes: 3 additions & 0 deletions pkg/git-1.8.0
@@ -0,0 +1,3 @@
URL=http://git-core.googlecode.com/files/git-1.8.0.tar.gz
TYPE=tar
DESC="the fast version control system"
3 changes: 3 additions & 0 deletions pkg/libgit2
@@ -0,0 +1,3 @@
URL=git://github.com/libgit2/libgit2.git
TYPE=git
DESC="libgit2 library"
4 changes: 4 additions & 0 deletions pkg/libgit2-glib
@@ -0,0 +1,4 @@
URL=git://git.gnome.org/libgit2-glib
TYPE=git
DESC="GObject bindings for libgit2"
DEPS="libgit2"
4 changes: 0 additions & 4 deletions pkg/valabind-0.6.5

This file was deleted.

4 changes: 4 additions & 0 deletions pkg/valabind-0.7.2
@@ -0,0 +1,4 @@
URL=http://radare.org/get/valabind-0.7.2.tar.gz
TYPE=tar
DESC="vala bindings compiler"
DEPS="vala-0.18.1"
4 changes: 0 additions & 4 deletions pkg/valaswig

This file was deleted.

22 changes: 16 additions & 6 deletions slpm
Expand Up @@ -205,19 +205,26 @@ pkg_build() {
if [ -n "${PRECONFIGURE}" ]; then
${PRECONFIGURE}
fi
if [ -f "autogen.sh" -a ! -f "configure" -a -z "${PKGCONFIGURE}" ]; then
PKGCONFIGURE="sh autogen.sh --prefix=${PREFIX}"
fi
if [ -n "${PKGCONFIGURE}" ]; then
${PKGCONFIGURE}
else
if [ -f "setup.py" ]; then
python setup.py build
:> .slpm_build_done
else
[ -f ${CONFIGURE} ] && chmod +x ${CONFIGURE}
if [ -x "${CONFIGURE}" ]; then
${CONFIGURE} "--prefix=${PREFIX}" ${CFGARGS} ${USER_CFGARGS}
if [ ! $? = 0 ]; then
echo "=> Configure stage failed :("
exit 1
if [ -f "CMakeLists.txt" ]; then
cmake . -DCMAKE_INSTALL_PREFIX=${PREFIX}
else
[ -f ${CONFIGURE} ] && chmod +x ${CONFIGURE}
if [ -x "${CONFIGURE}" ]; then
${CONFIGURE} "--prefix=${PREFIX}" ${CFGARGS} ${USER_CFGARGS}
if [ ! $? = 0 ]; then
echo "=> Configure stage failed :("
exit 1
fi
fi
fi
fi
Expand Down Expand Up @@ -254,6 +261,9 @@ pkg_install() {
if [ -f setup.py ]; then
${PYTHON} setup.py install --root "${DESTDIR}/${PREFIX}"
else
#if [ -f CMakeLists.txt ]; then
# PKGINSTALL_ARGS="DESTDIR=${PREFIX}"
#fi
echo "=> Running: ${PKGINSTALL} ${PKGINSTALL_ARGS}"
for a in ${PKGINSTALL_ARGS} ; do
eval export ${a}
Expand Down

0 comments on commit 46a2219

Please sign in to comment.