Page MenuHomeDevCentral
Files F3768222

D1224.id3145.diff
No OneTemporary
Actions

D1224.id3145.diff
View Options

diff --git a/roles/viperserv/init.sls b/roles/viperserv/init.sls
--- a/roles/viperserv/init.sls
+++ b/roles/viperserv/init.sls
@@ -20,4 +20,5 @@
- .eggdrop
- .fbsql
- .fantoir
+ - .rabbitmq-tcl
- .wikidata-access-layer
diff --git a/roles/viperserv/rabbitmq-tcl/files/Makefile-FreeBSD.patch b/roles/viperserv/rabbitmq-tcl/files/Makefile-FreeBSD.patch
new file mode 100644
--- /dev/null
+++ b/roles/viperserv/rabbitmq-tcl/files/Makefile-FreeBSD.patch
@@ -0,0 +1,40 @@
+diff --git a/src/Makefile b/src/Makefile
+index f0f0a0b..932876b 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -37,13 +37,13 @@ TCLVERSION=8.6
+
+ # Headers to include
+
+-TCL_INCLUDE=/usr/include/tcl${TCLVERSION}
+-RABBITMQ_INCLUDE=/usr/include
++TCL_INCLUDE=/usr/local/include/tcl$(TCLVERSION)
++RABBITMQ_INCLUDE=/usr/local/include
+ INCLUDES=-I$(TCL_INCLUDE) -I$(RABBITMQ_INCLUDE)
+
+ # Libraries to use
+
+-LIBS=-ltcl${TCLVERSION} -lrabbitmq
++LIBS=-L/usr/local/lib -ltcl$(subst .,,${TCLVERSION}) -lrabbitmq
+
+ # Features
+
+diff --git a/tests/Makefile b/tests/Makefile
+index 758220d..9df280a 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -30,12 +30,11 @@ TCLVERSION=8.6
+
+ # Headers to include
+
+-TCL_INCLUDE=/usr/include/tcl${TCLVERSION}
+-INCLUDES=-I$(TCL_INCLUDE)
++TCL_INCLUDE=/usr/local/include/tcl$(TCLVERSION)
++INCLUDES=-I/usr/local/include -I$(TCL_INCLUDE)
+
+ # Libraries to use
+-
+-LIBS=-lcmocka -ltcl -lrabbitmq
++LIBS=-L/usr/local/lib -lcmocka -ltcl${TCLVERSION:S/.//} -lrabbitmq
+
+ # Commands to use
diff --git a/roles/viperserv/rabbitmq-tcl/init.sls b/roles/viperserv/rabbitmq-tcl/init.sls
new file mode 100644
--- /dev/null
+++ b/roles/viperserv/rabbitmq-tcl/init.sls
@@ -0,0 +1,59 @@
+# -------------------------------------------------------------
+# Salt — Deploy eggdrop park
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Created: 2017-11-17
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+{% from "map.jinja" import packages with context %}
+
+# -------------------------------------------------------------
+# Build fbsql
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+rabbitmq-tcl_dependencies:
+ pkg.installed:
+ - pkgs:
+ - {{ packages.librabbitmq }}
+
+rabbitmq-tcl_repo:
+ file.directory:
+ - name: /opt/rabbitmq-tcl
+ - user: builder
+ - group: deployment
+ - dir_mode: 755
+ git.latest:
+ - name: https://devcentral.nasqueron.org/source/rabbitmq-tcl.git
+ - target: /opt/rabbitmq-tcl
+ - user: builder
+
+fbsql_build:
+ {% if grains['os'] == 'FreeBSD' %}
+ file.managed:
+ - name: /opt/rabbitmq-tcl/Makefile-FreeBSD.patch
+ - source: salt://roles/viperserv/rabbitmq-tcl/files/Makefile-FreeBSD.patch
+ - user: builder
+ - group: deployment
+ cmd.run:
+ - name: |
+ patch -p1 < Makefile-FreeBSD.patch
+ cd src/
+ gmake
+ {% else %}
+ cmd.run:
+ - name: cd src && make
+ {% endif %}
+ - runas: builder
+ - cwd: /opt/rabbitmq-tcl
+ - creates: /opt/rabbitmq-tcl/build/rabbitmq.so
+
+# -------------------------------------------------------------
+# Install fbsql
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+/srv/viperserv/lib/rabbitmq.so:
+ file.symlink:
+ - target: /opt/rabbitmq-tcl/build/rabbitmq.so
+ - user: viperserv
+ - group: nasqueron-irc

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 24, 07:10 (20 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2259680
Default Alt Text
D1224.id3145.diff (3 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator