Skip to content
This repository has been archived by the owner on Dec 3, 2019. It is now read-only.

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
ConnorRigby committed Mar 7, 2019
1 parent ba06052 commit 88e4ffd
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
elixir 1.8.1-otp-21
erlang 21.2.4
16 changes: 10 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
# ERTS_DIR Erlang runtime directory.
# ERL_LDFLAGS additional linker flags for projects referencing Erlang libraries

PREFIX = $(MIX_COMPILE_PATH)/../priv
BUILD = $(MIX_COMPILE_PATH)/../obj

# Check that we're on a supported build platform
ifeq ($(CROSSCOMPILE),)
# Not crosscompiling, so check that we're on Linux.
Expand All @@ -29,7 +32,7 @@ endif
endif


DEFAULT_TARGETS ?= priv priv/dhcp_server.so
DEFAULT_TARGETS ?= $(PREFIX) $(PREFIX)/dhcp_server.so

LDFLAGS += -shared -fPIC
CFLAGS ?= -O2 -Wall -fPIC -std=c99
Expand All @@ -38,14 +41,15 @@ CFLAGS ?= -O2 -Wall -fPIC -std=c99

all: $(DEFAULT_TARGETS)

c_src/dhcp_server.o:
$(BUILD)/dhcp_server.o:
$(CC) -c $(CFLAGS) -o $@ -I$(ERTS_DIR)/include c_src/dhcp_server.c

priv:
mkdir -p priv
$(PREFIX):
mkdir -p $(BUILD)
mkdir -p $(PREFIX)

priv/dhcp_server.so: c_src/dhcp_server.o
$(PREFIX)/dhcp_server.so: $(BUILD)/dhcp_server.o
$(CC) $^ $(ERL_LDFLAGS) $(LDFLAGS) -o $@

clean:
rm -f priv/dhcp_server.* c_src/*.o
rm -f $(PREFIX)/dhcp_server.* $(BUILD)/*.o
6 changes: 3 additions & 3 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ defmodule DHCPServer.Mixfile do
[
app: :dhcp_server,
version: "0.6.0",
elixir: "~> 1.4",
elixir: "~> 1.8",
compilers: [:elixir_make] ++ Mix.compilers(),
package: package(),
description: description(),
Expand All @@ -25,8 +25,8 @@ defmodule DHCPServer.Mixfile do

def deps do
[
{:elixir_make, "~> 0.4", runtime: false},
{:ex_doc, "~> 0.18.4", only: :dev}
{:elixir_make, "~> 0.5", runtime: false},
{:ex_doc, "~> 0.19", only: :dev}
]
end

Expand Down
9 changes: 6 additions & 3 deletions mix.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
%{
"earmark": {:hex, :earmark, "1.2.6", "b6da42b3831458d3ecc57314dff3051b080b9b2be88c2e5aa41cd642a5b044ed", [:mix], [], "hexpm"},
"elixir_make": {:hex, :elixir_make, "0.4.2", "332c649d08c18bc1ecc73b1befc68c647136de4f340b548844efc796405743bf", [:mix], [], "hexpm"},
"ex_doc": {:hex, :ex_doc, "0.18.4", "4406b8891cecf1352f49975c6d554e62e4341ceb41b9338949077b0d4a97b949", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"},
"earmark": {:hex, :earmark, "1.3.1", "73812f447f7a42358d3ba79283cfa3075a7580a3a2ed457616d6517ac3738cb9", [:mix], [], "hexpm"},
"elixir_make": {:hex, :elixir_make, "0.5.2", "96a28c79f5b8d34879cd95ebc04d2a0d678cfbbd3e74c43cb63a76adf0ee8054", [:mix], [], "hexpm"},
"ex_doc": {:hex, :ex_doc, "0.19.3", "3c7b0f02851f5fc13b040e8e925051452e41248f685e40250d7e40b07b9f8c10", [:mix], [{:earmark, "~> 1.2", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.10", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
"makeup": {:hex, :makeup, "0.8.0", "9cf32aea71c7fe0a4b2e9246c2c4978f9070257e5c9ce6d4a28ec450a839b55f", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
"makeup_elixir": {:hex, :makeup_elixir, "0.13.0", "be7a477997dcac2e48a9d695ec730b2d22418292675c75aa2d34ba0909dcdeda", [:mix], [{:makeup, "~> 0.8", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"},
"nerves_network": {:hex, :nerves_network, "0.3.7", "200767191b1ded5a61cddbacd3efdce92442cc055bdc37c20ca8c7cb1d964098", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:nerves_network_interface, "~> 0.4.4", [hex: :nerves_network_interface, repo: "hexpm", optional: false]}, {:nerves_wpa_supplicant, "~> 0.3", [hex: :nerves_wpa_supplicant, repo: "hexpm", optional: false]}, {:system_registry, "~> 0.7", [hex: :system_registry, repo: "hexpm", optional: false]}], "hexpm"},
"nerves_network_interface": {:hex, :nerves_network_interface, "0.4.4", "200b1a84bc1a7fdeaf3a1e0e2d4e9b33e240b034e73f39372768d43f8690bae0", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
"nerves_wpa_supplicant": {:hex, :nerves_wpa_supplicant, "0.3.3", "91b8505c023e891561ac6c64b9955450aa67fb16b523b18db5eeb4b4bcf30dc7", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
"nimble_parsec": {:hex, :nimble_parsec, "0.5.0", "90e2eca3d0266e5c53f8fbe0079694740b9c91b6747f2b7e3c5d21966bba8300", [:mix], [], "hexpm"},
"system_registry": {:hex, :system_registry, "0.8.0", "09240347628b001433d18279a2759ef7237ba7361239890d8c599cca9a2fbbc2", [:mix], [], "hexpm"},
}

0 comments on commit 88e4ffd

Please sign in to comment.