Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Working towards getting an OSX compile working. #1

Merged
merged 5 commits into from

2 participants

@fintler

Here's a simple addition that lets cjdns link into the libevent2 distributed with macports.

Edit: I also added include paths for libevent and an implicit header missing from Timeout.c.

@cjdelisle cjdelisle merged commit 180aed7 into cjdelisle:master
@cjdelisle
Owner

Merged in 76df063
Sorry for not noticing it sooner, it's probably a better plan to stop by the IRC channel if you want things done quickly.
Thanks a lot.

@fintler

No prob. I'm not in a rush at all. :-)

Awesome project btw.

@cjdelisle cjdelisle referenced this pull request from a commit
defel fix #1
avoid include of sys/sysctl.h on SmartOS
928466a
@inhies inhies referenced this pull request from a commit in inhies/cjdns
@inhies inhies Merge branch 'master' of github.com:cjdelisle/cjdns
* 'master' of github.com:cjdelisle/cjdns:
  Fixed another way that traces could cause an assert fail.
  Solve a rare bug caused by NodeStore altering a route to a less favorable route while it is being used.
  why oh why do the funnest software constructs also have to be the ones which introduce the most bugs?
  new protocol version
  renamed parseRoutes script to trashroutes and added an average index
  Fix segfault bug in RouteTracer
  new approach to dealing with trashroutes
  Update README.md
  fix #1
  doc: add SmartOS
f066fa1
@cjdelisle cjdelisle referenced this pull request from a commit
Caleb James DeLisle #1 if a node 'magically changes path', flush all outgoing links from …
…it's next-up peer, #2 squeeze a bit of logic out of NodeStore and put it other places.
0f3e478
@cjdelisle cjdelisle referenced this pull request from a commit
Caleb James DeLisle #1 Replace NodeStore_nodeForPath() with NodeStore_linkForPath() which…
… is more useful, #2 fix a crash bug in Janitor, #3 add a TODO comment
c6aef1c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
2  cmake/modules/FindLibevent2.cmake
@@ -8,6 +8,7 @@ else (LIBEVENT2_INCLUDE_DIRS AND LIBEVENT2_LIBRARIES)
${LIBEVENT2_PREFIX}/include
/usr/include
/usr/local/include
+ /opt/local/include
NO_DEFAULT_PATH
)
@@ -19,6 +20,7 @@ else (LIBEVENT2_INCLUDE_DIRS AND LIBEVENT2_LIBRARIES)
${LIBEVENT2_PREFIX}/lib
/usr/lib
/usr/local/lib
+ /opt/local/lib
NO_DEFAULT_PATH
)
if(LIBEVENT2_INCLUDE_DIRS AND LIBEVENT2_LIBRARIES)
View
0  crypto/nacl/build-nacl.sh 100644 → 100755
File mode changed
View
1  util/CMakeLists.txt
@@ -2,6 +2,7 @@ project(util C)
cmake_minimum_required(VERSION 2.4)
find_package(Libevent2 REQUIRED)
+include_directories(${LIBEVENT2_INCLUDE_DIRS})
add_library(util
AverageRoller.c
View
1  util/Timeout.c
@@ -1,3 +1,4 @@
+#include <stdint.h>
#include <sys/time.h>
#include <event2/event.h>
Something went wrong with that request. Please try again.