mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-10 13:50:08 +02:00
fb9d48218b
- A lot of more or less useful tools - Of interest in particular is git-forest, which is a command line tree view for git, much faster than tig.
136 lines
3.5 KiB
Plaintext
136 lines
3.5 KiB
Plaintext
From 4ca0152e3d8233bddfc206ed5de088f769c74c40 Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
|
Date: Sun, 7 Feb 2016 16:48:26 +0100
|
|
Subject: Haiku hacks.
|
|
|
|
|
|
diff --git a/sadmin/Makefile.am b/sadmin/Makefile.am
|
|
index a5fd009..108163f 100644
|
|
--- a/sadmin/Makefile.am
|
|
+++ b/sadmin/Makefile.am
|
|
@@ -15,8 +15,8 @@ pkglibexec_PROGRAMS = \
|
|
fd0ssh \
|
|
proc_iomem_count \
|
|
proc_stat_parse \
|
|
- psthreads \
|
|
- utmp_register
|
|
+ psthreads
|
|
+# utmp_register
|
|
if HAVE_LIBCAP
|
|
pkglibexec_PROGRAMS += printcaps
|
|
endif
|
|
@@ -27,15 +27,15 @@ dist_pkglibexec_SCRIPTS = \
|
|
recursive_lower \
|
|
vcsaview
|
|
|
|
-noinst_PROGRAMS = \
|
|
- xfs_irecover
|
|
+#noinst_PROGRAMS = \
|
|
+# xfs_irecover
|
|
|
|
dist_noinst_SCRIPTS = \
|
|
filenameconv \
|
|
raregetty \
|
|
rpmdep.pl
|
|
|
|
-clock_info_LDADD = -lrt
|
|
+#clock_info_LDADD = -lrt
|
|
ofl_LDADD = ${libHX_LIBS}
|
|
printcaps_LDADD = ${libHX_LIBS} ${libcap_LIBS}
|
|
proc_iomem_count_LDADD = ${libHX_LIBS}
|
|
diff --git a/sdevel/cctypeinfo.c b/sdevel/cctypeinfo.c
|
|
index f0f27e2..66954ed 100644
|
|
--- a/sdevel/cctypeinfo.c
|
|
+++ b/sdevel/cctypeinfo.c
|
|
@@ -18,8 +18,10 @@
|
|
#else
|
|
# include <netinet/in.h>
|
|
# define SIZET_FMT "z"
|
|
+#ifndef __HAIKU__
|
|
# define HAVE_LOFF_T 1
|
|
#endif
|
|
+#endif
|
|
|
|
struct x16 {
|
|
uint8_t a;
|
|
diff --git a/smm/Makefile.am b/smm/Makefile.am
|
|
index d8099d6..1bf4d3d 100644
|
|
--- a/smm/Makefile.am
|
|
+++ b/smm/Makefile.am
|
|
@@ -6,7 +6,7 @@ AM_CXXFLAGS = ${regular_CXXFLAGS}
|
|
CLEANFILES = omixer orec
|
|
|
|
bin_PROGRAMS = \
|
|
- clt2bdf hcdplay oplay
|
|
+ clt2bdf #hcdplay oplay
|
|
if HAVE_XBRZ
|
|
bin_PROGRAMS += cltxscale
|
|
endif
|
|
@@ -32,29 +32,29 @@ dist_pkglibexec_SCRIPTS = \
|
|
stxdb
|
|
|
|
bsvplay_SOURCES = bsvplay.c pcspkr_pcm.c
|
|
-bsvplay_LDADD = ${libHX_LIBS} -lm
|
|
+bsvplay_LDADD = ${libHX_LIBS} #-lm
|
|
clt2bdf_LDADD = ${libHX_LIBS}
|
|
clt2pbm_LDADD = ${libHX_LIBS}
|
|
cltxscale_SOURCES = cltxscale.c xbrz_call.cpp
|
|
cltxscale_LDADD = -lxbrz ${libHX_LIBS}
|
|
-hcdplay_LDADD = ${libHX_LIBS}
|
|
-oplay_LDADD = ${libHX_LIBS}
|
|
+#hcdplay_LDADD = ${libHX_LIBS}
|
|
+#oplay_LDADD = ${libHX_LIBS}
|
|
pcmdiff_LDADD = ${libHX_LIBS}
|
|
qplay_SOURCES = qplay.c pcspkr_pcm.c
|
|
-qplay_LDADD = ${libHX_LIBS} -lm
|
|
+qplay_LDADD = ${libHX_LIBS} #-lm
|
|
vfontas_LDADD = ${libHX_LIBS}
|
|
|
|
EXTRA_DIST = pcspkr.h
|
|
|
|
-omixer${EXEEXT}: oplay${EXEEXT}
|
|
- if [ ! -e omixer ]; then ln -s oplay omixer; fi;
|
|
+#omixer${EXEEXT}: oplay${EXEEXT}
|
|
+# if [ ! -e omixer ]; then ln -s oplay omixer; fi;
|
|
|
|
-orec${EXEEXT}: oplay${EXEEXT}
|
|
- if [ ! -e orec ]; then ln -s oplay orec; fi;
|
|
+#orec${EXEEXT}: oplay${EXEEXT}
|
|
+# if [ ! -e orec ]; then ln -s oplay orec; fi;
|
|
|
|
-all-local: omixer${EXEEXT} orec${EXEEXT}
|
|
+#all-local: omixer${EXEEXT} orec${EXEEXT}
|
|
|
|
-install-exec-local:
|
|
- test -z "${bindir}" || ${MKDIR_P} "${DESTDIR}${bindir}";
|
|
- ln -s "oplay${EXEEXT}" "${DESTDIR}${bindir}/orec${EXEEXT}";
|
|
- ln -s "oplay${EXEEXT}" "${DESTDIR}${bindir}/omixer${EXEEXT}";
|
|
+#install-exec-local:
|
|
+# test -z "${bindir}" || ${MKDIR_P} "${DESTDIR}${bindir}";
|
|
+# ln -s "oplay${EXEEXT}" "${DESTDIR}${bindir}/orec${EXEEXT}";
|
|
+# ln -s "oplay${EXEEXT}" "${DESTDIR}${bindir}/omixer${EXEEXT}";
|
|
diff --git a/suser/Makefile.am b/suser/Makefile.am
|
|
index 2c973a1..88d3a73 100644
|
|
--- a/suser/Makefile.am
|
|
+++ b/suser/Makefile.am
|
|
@@ -7,8 +7,8 @@ AM_CFLAGS = ${regular_CFLAGS}
|
|
bin_PROGRAMS = \
|
|
declone \
|
|
sysinfo \
|
|
- tailhex \
|
|
- xcp
|
|
+ tailhex
|
|
+# xcp
|
|
|
|
dist_bin_SCRIPTS = \
|
|
fxterm \
|
|
@@ -23,4 +23,4 @@ dist_pkglibexec_SCRIPTS = \
|
|
|
|
sysinfo_LDADD = ${libHX_LIBS} ${libmount_LIBS} ${libpci_LIBS} ${libxcb_LIBS}
|
|
tailhex_LDADD = ${libHX_LIBS}
|
|
-xcp_LDADD = ${libHX_LIBS}
|
|
+#xcp_LDADD = ${libHX_LIBS}
|
|
--
|
|
2.7.0
|
|
|